--- a/libInit.cc	Thu Mar 29 15:25:09 2012 +0100
+++ b/libInit.cc	Thu Mar 29 18:53:41 2012 +0100
@@ -1,9 +1,5 @@
 /*
-<<<<<<< .working
  * $Header$
-=======
- * $Header: /cvs/stx/stx/libbasic3/libInit.cc,v 1.95 2012/03/15 16:37:01 stefan Exp $
->>>>>>> .merge-right.r1901
  *
  * DO NOT EDIT
  * automagically generated from the projectDefinition: stx_libbasic3.
@@ -102,4 +98,3 @@
 _stx_137libbasic3_extensions_Init(pass,__pRT__,snd);
 __END_PACKAGE__();
 }
-