--- a/libtool.rc	Wed Mar 21 14:05:42 2012 +0000
+++ b/libtool.rc	Wed Mar 21 17:50:14 2012 +0000
@@ -3,7 +3,11 @@
 // automagically generated from the projectDefinition: stx_libtool.
 //
 VS_VERSION_INFO VERSIONINFO
+<<<<<<< .working
   FILEVERSION     6,2,7945,7945
+=======
+  FILEVERSION     6,2,1,79
+>>>>>>> .merge-right.r7949
   PRODUCTVERSION  6,2,1,1
 #if (__BORLANDC__)
   FILEFLAGSMASK   VS_FF_DEBUG | VS_FF_PRERELEASE
@@ -20,12 +24,20 @@
     BEGIN
       VALUE "CompanyName", "eXept Software AG\0"
       VALUE "FileDescription", "Smalltalk/X Tools (LIB)\0"
+<<<<<<< .working
       VALUE "FileVersion", "6.2.7945.7945\0"
+=======
+      VALUE "FileVersion", "6.2.1.79\0"
+>>>>>>> .merge-right.r7949
       VALUE "InternalName", "stx:libtool\0"
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\0"
       VALUE "ProductName", "Smalltalk/X\0"
       VALUE "ProductVersion", "6.2.1.1\0"
+<<<<<<< .working
       VALUE "ProductDate", "Tue, 20 Mar 2012 16:58:57 GMT\0"
+=======
+      VALUE "ProductDate", "Fri, 02 Mar 2012 14:30:26 GMT\0"
+>>>>>>> .merge-right.r7949
     END
 
   END