From: Erik van der Zalm <erik@vdzalm.eu>
Date: Sun, 12 Feb 2012 13:06:08 +0000 (+0100)
Subject: Fixed small merge bug
X-Git-Tag: iwj-success-2012-07-29~107
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=7699f250e31e61fa09636914c8ee7f4a1f340927;p=marlin.git

Fixed small merge bug
---

diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde
index 23ff730..07716fd 100644
--- a/Marlin/Marlin.pde
+++ b/Marlin/Marlin.pde
@@ -1303,7 +1303,6 @@ void manage_inactivity(byte debug)
       disable_e0();
       disable_e1();
       disable_e2();
-      #endif
     }
   }
   #ifdef EXTRUDER_RUNOUT_PREVENT