flancian/garden
0
0
Fork 0
mirror of https://github.com/flancian/garden.git synced 2026-08-07 06:56:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

git

Browse Source
This commit is contained in:
Flancian
2021-07-10 00:28:17 +02:00
parent f99e7126aa bb2b266a4a
commit e35c053c1e
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.obsidian-git-data
+11 -1
View File
@@ -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: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
.obsidian/plugins/obsidian-git/data.json
Vendored
+1 -1
View File
@@ -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)"}