# HG changeset patch
# User Ritor1
# Date 1361417150 -21600
# Node ID bbf8efb5bfeeab79258cd752582224f5192ec6aa
# Parent  bc7f77c694c3099196be728822d52d47241d07ad# Parent  95be2dcecadffbefb93e906acc3ca2944bff9cdb
Слияние

diff -r 95be2dcecadf -r bbf8efb5bfee mm7_4.cpp
--- a/mm7_4.cpp	Thu Feb 21 03:49:33 2013 +0200
+++ b/mm7_4.cpp	Thu Feb 21 09:25:50 2013 +0600
@@ -14990,7 +14990,6 @@
 
 
 
-
 //----- (0044622E) --------------------------------------------------------
 bool __fastcall EnterHouse(HOUSE_TYPE uHouseID)
 {