aboutsummaryrefslogtreecommitdiff
path: root/languages
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2012-11-30 12:42:51 +0100
committerSem <sembrestels@riseup.net>2012-11-30 12:42:51 +0100
commit36520e367d2d05b6e4c1f3d6703ea395c303d77b (patch)
treeccd50c74e771fa6a586f313050420285173a425b /languages
parent2c9ae443879a212d988a5034a07801060d283d59 (diff)
downloadelgg-36520e367d2d05b6e4c1f3d6703ea395c303d77b.tar.gz
elgg-36520e367d2d05b6e4c1f3d6703ea395c303d77b.tar.bz2
Revert "Finalize Copyright information" because merge is fucked.
This reverts commit 2c9ae443879a212d988a5034a07801060d283d59.
Diffstat (limited to 'languages')
-rw-r--r--languages/ca.php11
-rw-r--r--languages/en.php11
-rw-r--r--languages/es.php11
3 files changed, 0 insertions, 33 deletions
diff --git a/languages/ca.php b/languages/ca.php
index 10355fab1..214d327aa 100644
--- a/languages/ca.php
+++ b/languages/ca.php
@@ -7,23 +7,12 @@
*
* 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.
diff --git a/languages/en.php b/languages/en.php
index 8b18532a6..70bab4e05 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -7,23 +7,12 @@
*
* 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.
diff --git a/languages/es.php b/languages/es.php
index 6855c93f2..e49d0db47 100644
--- a/languages/es.php
+++ b/languages/es.php
@@ -7,23 +7,12 @@
*
* 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.