Make DOGLCD merge neater.

2013-04-29 22:03:37 +10:00
parent 7f57f28ccc
commit 1c127217df
1 changed files with 1 additions and 4 deletions
--- a/Marlin/Marlin.pde
+++ b/Marlin/Marlin.pde
@@ -40,10 +40,7 @@
  #elif defined(LCD_I2C_TYPE_MCP23017) || defined(LCD_I2C_TYPE_MCP23008)
    #include <Wire.h>
    #include <LiquidTWI2.h>
-  #else
-    #include <LiquidCrystal.h>
-  #endif
-  #ifdef DOGLCD
+  #elif defined(DOGLCD)
    #include <U8glib.h> // library for graphics LCD by Oli Kraus (https://code.google.com/p/u8glib/)
  #else
    #include <LiquidCrystal.h> // library for character LCD