chiark
/
gitweb
/
~ianmdlvl
/
marlin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
11518a9
)
Fixed small merge bug
author
Erik van der Zalm
<erik@vdzalm.eu>
Sun, 12 Feb 2012 13:06:08 +0000
(14:06 +0100)
committer
Erik van der Zalm
<erik@vdzalm.eu>
Sun, 12 Feb 2012 13:06:08 +0000
(14:06 +0100)
Marlin/Marlin.pde
patch
|
blob
|
history
diff --git
a/Marlin/Marlin.pde
b/Marlin/Marlin.pde
index 23ff730f397935127bf125bc2c4e0b798212f71d..07716fd35b225f2617c756ade25e107803a52907 100644
(file)
--- 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