1.1 --- a/version.h	Fri Jul 08 07:24:43 2005 +0000
     1.2 +++ b/version.h	Fri Jul 08 08:06:36 2005 +0000
     1.3 @@ -1,12 +1,7 @@
     1.4  #ifndef VERSION_H 
     1.5  #define VERSION_H
     1.6  
     1.7 -<<<<<<< version.h
     1.8  #define __VYM_VERSION__ "1.6.9"
     1.9  #define __BUILD_DATE__ "July 04, 2005"
    1.10 -=======
    1.11 -#define __VYM_VERSION__ "1.6.8"
    1.12 -#define __BUILD_DATE__ "June 14, 2005"
    1.13 ->>>>>>> 1.16
    1.14  
    1.15  #endif