diff -r 09e20ecaf6a3 -r 09edde7ae30e version.h
--- a/version.h	Fri Jul 08 07:24:43 2005 +0000
+++ b/version.h	Fri Jul 08 07:24:43 2005 +0000
@@ -1,7 +1,12 @@
 #ifndef VERSION_H 
 #define VERSION_H
 
+<<<<<<< version.h
+#define __VYM_VERSION__ "1.6.9"
+#define __BUILD_DATE__ "July 04, 2005"
+=======
 #define __VYM_VERSION__ "1.6.8"
 #define __BUILD_DATE__ "June 14, 2005"
+>>>>>>> 1.16
 
 #endif