--- a/libbasic3.rc	Wed Mar 21 17:46:55 2012 +0000
+++ b/libbasic3.rc	Wed Mar 28 15:18:54 2012 +0100
@@ -3,11 +3,7 @@
 // automagically generated from the projectDefinition: stx_libbasic3.
 //
 VS_VERSION_INFO VERSIONINFO
-<<<<<<< .working
-  FILEVERSION     6,2,1884,1884
-=======
   FILEVERSION     6,2,1,68
->>>>>>> .merge-right.r1901
   PRODUCTVERSION  6,2,1,1
 #if (__BORLANDC__)
   FILEFLAGSMASK   VS_FF_DEBUG | VS_FF_PRERELEASE
@@ -24,20 +20,12 @@
     BEGIN
       VALUE "CompanyName", "eXept Software AG\0"
       VALUE "FileDescription", "Smalltalk/X Additional Developer Basic Classes (LIB)\0"
-<<<<<<< .working
-      VALUE "FileVersion", "6.2.1884.1884\0"
-=======
       VALUE "FileVersion", "6.2.1.68\0"
->>>>>>> .merge-right.r1901
       VALUE "InternalName", "stx:libbasic3\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", "Thu, 23 Feb 2012 15:15:00 GMT\0"
-=======
-      VALUE "ProductDate", "Thu, 15 Mar 2012 16:36:41 GMT\0"
->>>>>>> .merge-right.r1901
     END
 
   END