aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
Diffstat (limited to 'version.inc')
-rw-r--r--version.inc5
1 files changed, 1 insertions, 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
+