# HG changeset patch
# User Ritor1
# Date 1361536367 -21600
# Node ID 172f1f9f55f46959522cb1830987cb777a0fe665
# Parent  c1a45052d6347328ae9de70880521f44ca242f57# Parent  6e984a4a896f9c381773497454aa21af8155717f
Слияние

diff -r 6e984a4a896f -r 172f1f9f55f4 mm7_4.cpp
--- a/mm7_4.cpp	Fri Feb 22 14:47:17 2013 +0600
+++ b/mm7_4.cpp	Fri Feb 22 18:32:47 2013 +0600
@@ -14988,7 +14988,6 @@
 
 
 
-
 //----- (0044622E) --------------------------------------------------------
 bool __fastcall EnterHouse(HOUSE_TYPE uHouseID)
 {