Skip to content

M
MarlinKimbra
Commit 9886264b authored by MagoKimbra's avatar MagoKimbra
Browse files
Options

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

parents 6a2455c5 8575259d
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
MarlinKimbra/Configuration_Store.cpp
View file @ 9886264b
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include "module/stepper.h" #include "module/stepper.h"
#include "module/temperature.h" #include "module/temperature.h"
#include "module/ultralcd.h" #include "module/ultralcd.h"
#include "configuration_store.h" #include "Configuration_Store.h"
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
#include "module/cardreader.h" #include "module/cardreader.h"
......
MarlinKimbra/module/nextion_lcd.cpp
View file @ 9886264b
#include "../base.h" #include "../base.h"
#include "../Marlin_main.h" #include "../Marlin_main.h"
#include "../configuration_store.h" #include "../Configuration_Store.h"
#if ENABLED(NEXTION) #if ENABLED(NEXTION)
#include "cardreader.h" #include "cardreader.h"
......
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