From 5232d2bd676f00508ad450e37e3f443e85f8dc28 Mon Sep 17 00:00:00 2001
From: Frank Celler <frank@arangodb.com>
Date: Thu, 17 Oct 2013 19:09:39 +0200
Subject: [PATCH] fixed merge problem

---
 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index e5664ff280..c16754f19f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-v1.4.0-beta2 (2013-10-14)
+v1.4.0-XXXXX (2013-XX-XX)
 -------------------------
 
 * fixed issue #617: Swagger API is missing '/_api/version'