Skip to content

Instantly share code, notes, and snippets.

@anttix

anttix/gist:d3f0f48ef72f9a00f34070c01c965e3b

Created December 14, 2019 02:48
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save anttix/d3f0f48ef72f9a00f34070c01c965e3b to your computer and use it in GitHub Desktop.
Save anttix/d3f0f48ef72f9a00f34070c01c965e3b to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
Files in conflict for method 1 and 2:
config/examples/MPCNC/Archim2_T8_16T_LCD_16step/Configuration.h
config/examples/MPCNC/Archim2_T8_16T_LCD_16step/Configuration_adv.h
config/examples/ZenXY/MiniRambo_16T/Configuration.h
config/examples/ZenXY/MiniRambo_16T/Configuration_adv.h
config/examples/ZenXY/Ramps_16T_LCD_32/Configuration.h
config/examples/ZenXY/Ramps_16T_LCD_32/Configuration_adv.h
Files in conflict for method 3:
config/examples/MPCNC/Archim2_T8_16T_LCD_16step/Configuration.h
config/examples/ZenXY/MiniRambo_16T/Configuration.h
config/examples/ZenXY/Ramps_16T_LCD_32/Configuration.h
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment