Changeset 9285 for extensions/akBookStyle/trunk/language

Timestamp:

Feb 19, 2011, 1:09:47 PM (14 years ago)

Author:

nikrou

Message:

Forget indexes

File:

• extensions/akBookStyle/trunk/language/it_IT/index.php (modified) (3 diffs)

extensions/akBookStyle/trunk/language/it_IT/index.php

@@ -1 +1 @@
 <?php
 // +-----------------------------------------------------------------------+
-<<<<<<< HEAD
-// | PhpWebGallery - a PHP based picture gallery                           |
-// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
-// +-----------------------------------------------------------------------+
-// | file          : $Id: index.php 6934 2010-09-15 20:24:46Z ddtddt $
-// | last update   : $Date: 2010-09-15 22:24:46 +0200 (mer. 15 sept. 2010) $
-// | last modifier : $Author: ddtddt $
-// | revision      : $Revision: 6934 $
-=======
 // | akBookStyle  - a plugin for Piwigo                                    |
 // +-----------------------------------------------------------------------+
 // | Copyright(C) 2009-2010 Nicolas Roudaire        http://www.nikrou.net  |
 // | Copyright(C) 2009      vdigital                                       |
->>>>>>> Forget indexes
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
@@ -28 +17 @@
 // | You should have received a copy of the GNU General Public License     |
 // | along with this program; if not, write to the Free Software           |
-<<<<<<< HEAD
-// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
-// | USA.                                                                  |
-=======
 // | Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,            |
 // | MA 02110-1301 USA                                                     |
->>>>>>> Forget indexes
 // +-----------------------------------------------------------------------+
 
@@ -43 +27 @@
 header( 'Location: '.$url );
 exit();
-<<<<<<< HEAD
 ?>
-=======
-?>
->>>>>>> Forget indexes