mirror of
https://github.com/flancian/garden.git
synced 2026-08-07 15:06:19 +00:00
git
This commit is contained in:
@@ -1,2 +1,12 @@
|
||||
<<<<<<< HEAD
|
||||
Sat Jul 10 2021 00:27:17 GMT+0200 (Central European Summer Time)
|
||||
Sat Jul 10 2021 00:27:17 GMT+0200 (Central European Summer Time)
|
||||
=======
|
||||
Sat Jul 10 2021 00:27:33 GMT+0200 (Central European Summer Time)
|
||||
Sat Jul 10 2021 00:26:33 GMT+0200 (Central European Summer Time)
|
||||
Sat Jul 10 2021 00:26:33 GMT+0200 (Central European Summer Time)
|
||||
=======
|
||||
Sat Jul 10 2021 00:26:17 GMT+0200 (Central European Summer Time)
|
||||
Sat Jul 10 2021 00:25:17 GMT+0200 (Central European Summer Time)
|
||||
>>>>>>> b1893220e24f5e449a4d008f1a6d11e5f6049244
|
||||
>>>>>>> bb2b266a4ad1955da598f2d64adc55d047d768f3
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
{"commitMessage":"[[snapshot]]: {{date}}","commitDateFormat":"YYYY-MM-DD HH:mm:ss","autoSaveInterval":1,"autoPullInterval":1,"autoPullOnBoot":true,"disablePush":false,"pullBeforePush":true,"disablePopups":true,"listChangedFilesInMessageBody":true,"showStatusBar":true,"lastAutoBackUp":"Mon Jun 21 2021 14:19:17 GMT+0200 (Central European Summer Time)","lastAutoPull":"Mon Jun 21 2021 14:19:17 GMT+0200 (Central European Summer Time)"}
|
||||
{"commitMessage":"[[snapshot]]: {{date}}","commitDateFormat":"YYYY-MM-DD HH:mm:ss","autoSaveInterval":1,"autoPullInterval":1,"autoPullOnBoot":true,"disablePush":false,"pullBeforePush":true,"disablePopups":false,"listChangedFilesInMessageBody":true,"showStatusBar":true,"lastAutoBackUp":"Sat Jul 03 2021 11:50:30 GMT+0200 (Central European Summer Time)","lastAutoPull":"Sat Jul 03 2021 11:50:30 GMT+0200 (Central European Summer Time)"}
|
||||
Reference in New Issue
Block a user