Fixed conflicts from merge

[netatalk.git] / VERSION

diff --git a/VERSION b/VERSION
index ed9e076d0649773651d68edf1ecf66b897704894..5977a0fdbd00815c1c0135deeb70d81140a67ca1 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2dev
+2.2dev
\ No newline at end of file