am --skip: revert changes introduced by failed 3way merge

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index b32d9314f74a109270c12d97eafe7180e5e4fdd6..f9f8f32740861d872365baf388d30c56e194141e 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.9.5
+DEF_VER=v2.2.2
 
 LF='
 '