From 2c9ae443879a212d988a5034a07801060d283d59 Mon Sep 17 00:00:00 2001 From: hellekin Date: Thu, 8 Nov 2012 22:34:11 -0300 Subject: 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 --- languages/ca.php | 11 +++++++++++ languages/en.php | 11 +++++++++++ languages/es.php | 11 +++++++++++ 3 files changed, 33 insertions(+) (limited to 'languages') 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 * +<<<<<<< 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 70bab4e05..8b18532a6 100644 --- a/languages/en.php +++ b/languages/en.php @@ -7,12 +7,23 @@ * * Copyright 2011-2012 Lorea Faeries * +<<<<<<< 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 e49d0db47..6855c93f2 100644 --- a/languages/es.php +++ b/languages/es.php @@ -7,12 +7,23 @@ * * Copyright 2011-2012 Lorea Faeries * +<<<<<<< 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. -- cgit v1.2.3