From 7d7e475e668b1356f0dc7c9334a3c87825ca0d38 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Fri, 3 Feb 2006 17:50:46 +0000
Subject: [PATCH] Fix: conflit cvs

---
 htdocs/facture.class.php | 4 ++--
 htdocs/master.inc.php    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/facture.class.php b/htdocs/facture.class.php
index 86e37f8e632..014608e05b4 100644
--- a/htdocs/facture.class.php
+++ b/htdocs/facture.class.php
@@ -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
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 153747e1dbb..5db833da7d4 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -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é