Fix: conflit cvs
This commit is contained in:
parent
062b61cc53
commit
7d7e475e66
@ -3,8 +3,8 @@
|
||||
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org>
|
||||
* Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be>
|
||||
* Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com>
|
||||
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
|
||||
* Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com>
|
||||
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
\version $Revision$
|
||||
*/
|
||||
|
||||
define('DOL_VERSION','2.0.0-alpha2');
|
||||
define('DOL_VERSION','2.1-alpha');
|
||||
|
||||
// La fonction clearstatcache ne doit pas etre appelé de manière globale car ralenti.
|
||||
// Elle doit etre appelé uniquement par les pages qui ont besoin d'un cache fichier vidé
|
||||
|
||||
Loading…
Reference in New Issue
Block a user