diff options
| author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-03-15 15:22:22 +0100 |
|---|---|---|
| committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-03-15 15:22:22 +0100 |
| commit | 7ac81ca86fa1176b0c12a3a835545f9f352e3f61 (patch) | |
| tree | f5082e247193a3b2e6404fdd5c7f3684e19951fb /src/include/taler_merchantdb_lib.h | |
| parent | f227e0380147b11b0668e35c46e7fa93d129cc96 (diff) | |
| parent | 9d76bbc96333942d4e2a22b8a27a67068408608c (diff) | |
| download | merchant-7ac81ca86fa1176b0c12a3a835545f9f352e3f61.tar.gz merchant-7ac81ca86fa1176b0c12a3a835545f9f352e3f61.tar.bz2 merchant-7ac81ca86fa1176b0c12a3a835545f9f352e3f61.zip | |
Merge branch 'master' of ssh://taler.net/var/git/merchant
Conflicts:
examples/blog/web-common
examples/shop/web-common
Diffstat (limited to 'src/include/taler_merchantdb_lib.h')
| -rw-r--r-- | src/include/taler_merchantdb_lib.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/include/taler_merchantdb_lib.h b/src/include/taler_merchantdb_lib.h index 9bdfc82c..283cd0b9 100644 --- a/src/include/taler_merchantdb_lib.h +++ b/src/include/taler_merchantdb_lib.h @@ -11,7 +11,7 @@ A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with - TALER; see the file COPYING. If not, If not, see <http://www.gnu.org/licenses/> + TALER; see the file COPYING.GPL. If not, If not, see <http://www.gnu.org/licenses/> */ /** |