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.