# HG changeset patch
# User Ritor1
# Date 1364961713 -21600
# Node ID 18f785019d3694e4ad80aa068062e0c6ab741d8e
# Parent  c684b3fb93ebadfa2ca61a2372313d7a6622d186# Parent  dba25247e74f264a8c9976bb7154584fbe732c38
Слияние

diff -r dba25247e74f -r 18f785019d36 mm7_2.cpp
--- a/mm7_2.cpp	Wed Apr 03 00:44:11 2013 +0100
+++ b/mm7_2.cpp	Wed Apr 03 10:01:53 2013 +0600
@@ -1305,7 +1305,6 @@
     }
   }
 }
-
 //----- (004BE386) --------------------------------------------------------
 void __fastcall log_error(const char *pMessage)
 {