Fix merge conflicts

[netatalk.git] / VERSION

diff --git a/VERSION b/VERSION
index 5ed43442e357ec5af98423b346ac65ab92069e04..ed9e076d0649773651d68edf1ecf66b897704894 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1.4dev
+2.2dev