From a3161a8cd696fcdbebc3d232f35aa2a56a14b869 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 6 Jan 2014 02:38:15 -0800
Subject: version update

---
 version.inc | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/version.inc b/version.inc
index f2022950c..fe1a4447d 100644
--- a/version.inc
+++ b/version.inc
@@ -1,5 +1,2 @@
-<<<<<<< HEAD
-2014-01-04.547
-=======
 2014-01-06.549
->>>>>>> master
+
-- 
cgit v1.2.3