git-pull doc: fix grammo ("conflicts" is plural)

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 4bc073cc135f6bda73a06b24c7b368d6c653224e..6f09e2ff8bbd1b84e35a65ecf834a6ebea791532 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.8.1-rc1
+DEF_VER=v1.8.1.5
 
 LF='
 '