--- a/libbasic.rc	Tue Mar 27 16:32:25 2012 +0100
+++ b/libbasic.rc	Wed Mar 28 01:53:20 2012 +0100
@@ -3,11 +3,7 @@
 // automagically generated from the projectDefinition: stx_libbasic.
 //
 VS_VERSION_INFO VERSIONINFO
-<<<<<<< .working
-  FILEVERSION     6,2,10763,10763
-=======
   FILEVERSION     6,2,1,98
->>>>>>> .merge-right.r10791
   PRODUCTVERSION  6,2,1,1
 #if (__BORLANDC__)
   FILEFLAGSMASK   VS_FF_DEBUG | VS_FF_PRERELEASE
@@ -24,11 +20,7 @@
     BEGIN
       VALUE "CompanyName", "eXept Software AG\0"
       VALUE "FileDescription", "Smalltalk/X Basic Classes (LIB)\0"
-<<<<<<< .working
-      VALUE "FileVersion", "6.2.10763.10763\0"
-=======
       VALUE "FileVersion", "6.2.1.98\0"
->>>>>>> .merge-right.r10791
       VALUE "InternalName", "stx:libbasic\0"
       VALUE "LegalCopyright", "Copyright Claus Gittinger 1988-2011\nCopyright eXept Software AG 1998-2011\0"
       VALUE "ProductName", "Smalltalk/X\0"