Merge branch 'rt/cherry-revert-conflict-summary'

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index c9425fb846eb8393edb95de0d345fa8ec52db471..b982e3329968366a214041cd57de8d4dbdd03c5e 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.7.10-rc2
+DEF_VER=v1.7.10.GIT
 
 LF='
 '