From 3d83c0c3b99e0a1b6b847ab129fb24242f53b8d3 Mon Sep 17 00:00:00 2001
From: Damien Regad <dregad@mantisbt.org>
Date: Sun, 27 Dec 2015 19:34:07 +0100
Subject: Update version to avoid merge conflicts

---
 adodb-error.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'adodb-error.inc.php')

diff --git a/adodb-error.inc.php b/adodb-error.inc.php
index b4e469b5..9a214d3b 100644
--- a/adodb-error.inc.php
+++ b/adodb-error.inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version   v5.21dev  ??-???-2015
+ * @version   v5.21.0-dev  ??-???-2015
  * @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
  * @copyright (c) 2014      Damien Regad, Mark Newnham and the ADOdb community
  * Released under both BSD license and Lesser GPL library license.
-- 
cgit v1.3