From 98d0d4819107fe05dde5561efd652d56f676e688 Mon Sep 17 00:00:00 2001 From: xifle Date: Mon, 20 May 2013 14:52:35 +0200 Subject: [PATCH] fixed merge --- Marlin/ultralcd.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 8354c88665..4a9042116f 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -76,7 +76,6 @@ static void menu_action_setting_edit_callback_float51(const char* pstr, float* p static void menu_action_setting_edit_callback_float52(const char* pstr, float* ptr, float minValue, float maxValue, menuFunc_t callbackFunc); static void menu_action_setting_edit_callback_long5(const char* pstr, unsigned long* ptr, unsigned long minValue, unsigned long maxValue, menuFunc_t callbackFunc); -#define ENCODER_STEPS_PER_MENU_ITEM 5 #define ENCODER_FEEDRATE_DEADZONE 10 #if !defined(LCD_I2C_VIKI)