aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
Diffstat (limited to 'version.inc')
-rw-r--r--version.inc4
1 files changed, 4 insertions, 0 deletions
diff --git a/version.inc b/version.inc
index 8d58eacdd..f2022950c 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1,5 @@
+<<<<<<< HEAD
+2014-01-04.547
+=======
2014-01-06.549
+>>>>>>> master