diff -r 2759212a27de -r 32f5982604f4 hedgewars/uWorld.pas
--- a/hedgewars/uWorld.pas	Sat Jan 04 23:55:54 2014 +0400
+++ b/hedgewars/uWorld.pas	Sun Jan 05 00:46:26 2014 +0400
@@ -1377,7 +1377,6 @@
 end;
 
 
->>>>>>> other
 procedure DrawWorldStereo(Lag: LongInt; RM: TRenderMode);
 var i, t: LongInt;
     r: TSDL_Rect;