aboutsummaryrefslogtreecommitdiffstats
path: root/version.inc
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-01-06 02:38:15 -0800
committerfriendica <info@friendica.com>2014-01-06 02:38:15 -0800
commita3161a8cd696fcdbebc3d232f35aa2a56a14b869 (patch)
tree2eacd0eb622866b3b77377401ed6e02033b0e7bb /version.inc
parent196b3022bd8759428d04d8d3bcf10c27d7c3b329 (diff)
downloadvolse-hubzilla-a3161a8cd696fcdbebc3d232f35aa2a56a14b869.tar.gz
volse-hubzilla-a3161a8cd696fcdbebc3d232f35aa2a56a14b869.tar.bz2
volse-hubzilla-a3161a8cd696fcdbebc3d232f35aa2a56a14b869.zip
version update
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
+