# HG changeset patch
# User Ritor1
# Date 1367669948 -21600
# Node ID d7f0572335ecd9a2cba571c4ccdc740f6cc0330a
# Parent  cbf623f00e6c9c2fcaae19e2881e584680e299d3# Parent  9a5db2cf999a34df1e63323615d99d7803a24045
Слияние

diff -r 9a5db2cf999a -r d7f0572335ec mm7_4.cpp
--- a/mm7_4.cpp	Sat May 04 17:45:17 2013 +0600
+++ b/mm7_4.cpp	Sat May 04 18:19:08 2013 +0600
@@ -1950,7 +1950,6 @@
   }
   return result;
 }
-
 //----- (004938D1) --------------------------------------------------------
 void __fastcall Rest(unsigned int uHoursToSleep)
 {