# HG changeset patch
# User Ritor1
# Date 1361464972 -21600
# Node ID b803545c1b963e95072a47dfe95bde54486078c7
# Parent  90017057667fc13787cc0c6132d071fe63951205# Parent  57d81602e72c1eb93b3a55137068c66143e1474b
Слияние

diff -r 57d81602e72c -r b803545c1b96 mm7_4.cpp
--- a/mm7_4.cpp	Thu Feb 21 17:24:15 2013 +0600
+++ b/mm7_4.cpp	Thu Feb 21 22:42:52 2013 +0600
@@ -14865,7 +14865,6 @@
   return result;
 }
 
-
 //----- (0044606A) --------------------------------------------------------
 void PrepareHouse(HOUSE_TYPE house)
 {