Commit 3242ac1 1 parent c966468 commit 3242ac1 Copy full SHA for 3242ac1
File tree 2 files changed +2
-10
lines changed
2 files changed +2
-10
lines changed Original file line number Diff line number Diff line change 41
41
* here we define this default string as the date where the latest release
42
42
* version was tagged.
43
43
*/
44
- <<<<<<< HEAD
45
- //#define STRING_DISTRIBUTION_DATE "2022-07-03"
46
- == = == ==
47
- //#define STRING_DISTRIBUTION_DATE "2022-07-05"
48
- >>>>>>> ed66845b03 ([cron ] Bump distribution date (2022 - 07 - 05 ))
44
+ //#define STRING_DISTRIBUTION_DATE "2022-07-06"
49
45
50
46
/**
51
47
* Defines a generic printer name to be output to the LCD after booting Marlin.
Original file line number Diff line number Diff line change 42
42
* version was tagged.
43
43
*/
44
44
#ifndef STRING_DISTRIBUTION_DATE
45
- <<<<<<< HEAD
46
- #define STRING_DISTRIBUTION_DATE "2022-07-03"
47
- == == == =
48
- #define STRING_DISTRIBUTION_DATE "2022-07-05"
49
- >>>>>>> ed66845b03 ([cron ] Bump distribution date (2022 - 07 - 05 ))
45
+ #define STRING_DISTRIBUTION_DATE "2022-07-06"
50
46
#endif
51
47
52
48
/**
You can’t perform that action at this time.
0 commit comments