Skip to content

M
MarlinKimbra
Commit 4cca7542 authored by MagoKimbra's avatar MagoKimbra
Browse files
Options

Merge remote-tracking branch 'refs/remotes/origin/master' into dev

parents c228f5e2 4f22aaa0
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
MarlinKimbra/module/dogm_lcd_implementation.h
View file @ 4cca7542
......@@ -11,6 +11,8 @@
* License: http://opensource.org/licenses/BSD-3-Clause
*/
#include "../base.h"
#ifndef DOGM_LCD_IMPLEMENTATION_H
#define DOGM_LCD_IMPLEMENTATION_H
......@@ -37,7 +39,6 @@
#include "ultralcd.h"
#include "ultralcd_st7920_u8glib_rrd.h"
#include "Configuration_Basic.h"
#if DISABLED(MAPPER_C2C3) && DISABLED(MAPPER_NON) && ENABLED(USE_BIG_EDIT_FONT)
#undef USE_BIG_EDIT_FONT
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment