aboutsummaryrefslogtreecommitdiff
path: root/languages/ca.php
diff options
context:
space:
mode:
authorhellekin <hellekin@cepheide.org>2012-11-08 22:34:11 -0300
committerhellekin <hellekin@cepheide.org>2012-11-08 23:40:54 -0300
commit2c9ae443879a212d988a5034a07801060d283d59 (patch)
tree9c9371630815558485d6d0f8e744f32b44e24b6d /languages/ca.php
parent58fd3ce5bbac21dc1ce4b583f781eb804bb28eb2 (diff)
downloadelgg-2c9ae443879a212d988a5034a07801060d283d59.tar.gz
elgg-2c9ae443879a212d988a5034a07801060d283d59.tar.bz2
Finalize Copyright information
Conflicts: languages/ca.php languages/en.php languages/es.php start.php views/default/css/lightbox.php views/default/js/embed/embed.php views/default/js/lightbox.php
Diffstat (limited to 'languages/ca.php')
-rw-r--r--languages/ca.php11
1 files changed, 11 insertions, 0 deletions
diff --git a/languages/ca.php b/languages/ca.php
index 214d327aa..10355fab1 100644
--- a/languages/ca.php
+++ b/languages/ca.php
@@ -7,12 +7,23 @@
*
* Copyright 2011-2012 Lorea Faeries <federation@lorea.org>
*
+<<<<<<< HEAD
* This program is free software: you can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License
* as published by the Free Software Foundation, either version 3 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
+=======
+ * This file is part of the Colorbox plugin for Elgg.
+ *
+ * Colorbox is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Colorbox is distributed in the hope that it will be useful, but
+>>>>>>> cb063a6... Finalize Copyright information
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Affero General Public License for more details.