Merge branch 'master' of https://github.com/bkubicek/Marlin

Conflicts: Marlin/Configuration.h
bkubicek · Nov 1, 2011 · 873903f · 873903f
2 parents b65970e + 0e5054a
commit 873903f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
@@ -1,5 +1,4 @@
 
-
 #ifndef CONFIGURATION_H
 #define CONFIGURATION_H
 
@@ -153,6 +152,7 @@ bool axis_relative_modes[] = {false, false, false, false};
 #define SMOOTHFACTOR 5.0
 float current_raw_average=0;
 
+
 #define GRACETEMP 0  //temperature which already counts as reached for M109
 #define PIDTEMP
 #ifdef PIDTEMP