flancian/garden
0
0
Fork 0
mirror of https://github.com/flancian/garden.git synced 2026-08-07 23:16:21 +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 02:04:46 +02:00
parent 045d990860 128707bdc0
commit d847005c38
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -1,4 +1,5 @@
.obsidian/workspace .obsidian/workspace
.obsidian/plugins/obsidian-git/data.json .obsidian/plugins/obsidian-git/data.json
.obsidian/plugins/ .obsidian/plugins/
.obsidian
*.swp *.swp
.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":false,"listChangedFilesInMessageBody":true,"showStatusBar":true,"lastAutoBackUp":"Sat May 08 2021 02:03:38 GMT+0200 (Central European Summer Time)","lastAutoPull":"Sat May 08 2021 02:02:46 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 02:04:38 GMT+0200 (Central European Summer Time)","lastAutoPull":"Sat May 08 2021 02:03:46 GMT+0200 (Central European Summer Time)"}
conflict-files-obsidian-git.md
+1 -2
View File
@@ -1,4 +1,3 @@
# Conflict files # Conflict files
Please resolve them and commit per command (This file will be deleted before the commit). Please resolve them and commit per command (This file will be deleted before the commit).
- Not a file: .obsidian/plugins/obsidian-git/data.json - Not a file: .obsidian/plugins/obsidian-git/data.json
- Not a file: .obsidian/workspace