Skip to content

Commit 3242ac1

Browse files
thinkyheadLCh-77
authored andcommitted
[cron] Bump distribution date (2022-07-06)
1 parent c966468 commit 3242ac1

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

Marlin/Version.h

+1-5
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,7 @@
4141
* here we define this default string as the date where the latest release
4242
* version was tagged.
4343
*/
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"
4945

5046
/**
5147
* Defines a generic printer name to be output to the LCD after booting Marlin.

Marlin/src/inc/Version.h

+1-5
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,7 @@
4242
* version was tagged.
4343
*/
4444
#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"
5046
#endif
5147

5248
/**

0 commit comments

Comments
 (0)