From 36520e367d2d05b6e4c1f3d6703ea395c303d77b Mon Sep 17 00:00:00 2001 From: Sem Date: Fri, 30 Nov 2012 12:42:51 +0100 Subject: Revert "Finalize Copyright information" because merge is fucked. This reverts commit 2c9ae443879a212d988a5034a07801060d283d59. --- languages/ca.php | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'languages/ca.php') 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 * -<<<<<<< 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