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

notes/.obsidian/plugins/obsidian-activity-history/data.json

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

notes/conflict-files-obsidian-git.md

@@ -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

notes/notes.md

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