dan/notes
1
0
Fork 0
mirror of https://github.com/danbulant/notes synced 2026-07-05 02:50:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' of ssh://github.com/danbulant/notes

Browse source
This commit is contained in:
Daniel Bulant 2021-12-14 16:47:19 +01:00
commit 7731f03c14
3 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
notes/.obsidian/plugins/obsidian-activity-history/data.json vendored
View file

@ -220,9 +220,21 @@
"date": "2021-12-11", "date": "2021-12-11",
"value": 0 "value": 0
}, },
{
"date": "2021-12-10",
"value": 4093
},
{
"date": "2021-12-11",
"value": 0
},
{ {
"date": "2021-12-13", "date": "2021-12-13",
"value": 15651 "value": 15651
},
{
"date": "2021-12-14",
"value": 60000
} }
] ]
} }

3
notes/conflict-files-obsidian-git.md Normal file
View file

@ -0,0 +1,3 @@
# conflict-files-obsidian-git
Please resolve them and commit per command (This file will be deleted before the commit).
- Not a file: notes/.obsidian/plugins/obsidian-activity-history/data.json

1
notes/notes.md
View file

@ -7,6 +7,7 @@ noteOnly: true
%% Zoottelkeeper: Beginning of the autogenerated index file list %% %% Zoottelkeeper: Beginning of the autogenerated index file list %%
- [[ang/ang|ang]] - [[ang/ang|ang]]
- [[cjl/cjl|cjl]] - [[cjl/cjl|cjl]]
- [[conflict-files-obsidian-git|conflict-files-obsidian-git]]
- [[data/data|data]] - [[data/data|data]]
- [[dej/dej|dej]] - [[dej/dej|dej]]
- [[ech/ech|ech]] - [[ech/ech|ech]]