Fix fce merge conflict

[netatalk.git] / VERSION

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