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

Merge branch 'master' of github.com:flancian/garden

Browse Source
This commit is contained in:
Flancian
2021-05-08 01:51:35 +02:00
parent 386dc48f74 27615d2297
commit bfb4ca4492
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -2,3 +2,4 @@
private/
.obsidian/workspace
.obsidian/plugins/obsidian-git/data.json
.obsidian/plugins/obsidian-git/data.json
Vendored
+1 -5
View File
@@ -1,5 +1 @@
<<<<<<< HEAD
{"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 May 08 2021 01:50:27 GMT+0200 (Central European Summer Time)","lastAutoPull":"Sat May 08 2021 01:50:27 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 May 08 2021 01:49:38 GMT+0200 (Central European Summer Time)","lastAutoPull":"Sat May 08 2021 01:48:46 GMT+0200 (Central European Summer Time)"}
>>>>>>> b1c5a29aa66dc3f6cd7a95c742a7ba8939874e5c
{"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 May 08 2021 01:51:27 GMT+0200 (Central European Summer Time)","lastAutoPull":"Sat May 08 2021 01:51:27 GMT+0200 (Central European Summer Time)"}