Index: libcfa/src/fstream.cfa
===================================================================
--- libcfa/src/fstream.cfa	(revision 441d11cbed45fdc45fa2c960d28fd19e5d445c43)
+++ libcfa/src/fstream.cfa	(revision 52e311aaa855699ce88611303a33b2aa25411e8b)
@@ -177,23 +177,4 @@
 } // fmt
 
-<<<<<<< HEAD
-inline void acquire( ofstream & os ) with(os) {
-	lock( lock$ );										// may increase recursive lock
-	if ( ! acquired$ ) acquired$ = true;				// not locked ?
-	else unlock( lock$ );								// unwind recursive lock at start
-} // acquire
-
-inline void release( ofstream & os ) {
-	unlock( os.lock$ );
-} // release
-
-void lock( ofstream & os ) { acquire( os ); }
-void unlock( ofstream & os ) { release( os ); }
-
-void ?{}( osacquire & acq, ofstream & os ) { lock( os.lock$ ); &acq.os = &os; }
-void ^?{}( osacquire & acq ) { release( acq.os ); }
-
-=======
->>>>>>> 15885de998d9500373efda8e609b893c87e6363a
 static ofstream soutFile = { (FILE *)stdout };
 ofstream & sout = soutFile, & stdout = soutFile;