Merge pull request #6382 from MagoKimbra/fix_configuration_store

Fix double definition in configuration_store
This commit is contained in:
Scott Lahteine 2017-04-20 15:06:58 -05:00 committed by GitHub
commit d38a792a91

View file

@ -1201,13 +1201,6 @@ void MarlinSettings::reset() {
#define CONFIG_ECHO_START do{ if (!forReplay) SERIAL_ECHO_START; }while(0)
#if ENABLED(INCH_MODE_SUPPORT)
extern float linear_unit_factor;
#define LINEAR_UNIT(N) ((N) / linear_unit_factor)
#else
#define LINEAR_UNIT(N) N
#endif
/**
* M503 - Report current settings in RAM
*