From d91bfa37c608d350eff7b2219de914e78b8e8bbb Mon Sep 17 00:00:00 2001
From: Daniel Bulant <danbulant@gmail.com>
Date: Thu, 21 Oct 2021 18:08:57 +0200
Subject: [PATCH] merge

---
 notes/.obsidian/community-plugins.json        | 57 +++++++++----------
 notes/.obsidian/graph.json                    |  4 +-
 .../obsidian-activity-history/data.json       | 41 ++-----------
 notes/mat/ucitel.md                           |  4 +-
 4 files changed, 36 insertions(+), 70 deletions(-)

diff --git a/notes/.obsidian/community-plugins.json b/notes/.obsidian/community-plugins.json
index 928fe24..92c853f 100644
--- a/notes/.obsidian/community-plugins.json
+++ b/notes/.obsidian/community-plugins.json
@@ -1,32 +1,29 @@
 [
-  "obsidian-charts",
-  "obsidian-git",
-  "obsidian-activity-history",
-  "obsidian-gist",
-  "emoji-shortcodes",
-  "dataview",
-  "templater-obsidian",
-  "obsidian-mind-map",
-  "obsidian-outliner",
-  "obsidian-admonition",
-  "table-editor-obsidian",
-  "obsidian-auto-link-title",
-  "open-note-to-window-title",
-<<<<<<< HEAD
-  "obsidian-autocomplete-plugin",
-  "code-block-copy",
-  "cycle-through-panes",
-  "cm-editor-syntax-highlight-obsidian",
-  "obsidian-emoji-toolbar",
-  "obsidian-filename-heading-sync",
-  "hotkey-helper",
-  "obsidian-icons-plugin",
-  "obsidian-kanban",
-  "url-into-selection",
-  "obsidian-plugin-toc",
-  "wikilinks-to-mdlinks-obsidian"
-=======
-  "obsidian-filename-heading-sync",
-  "obsidian-latex"
->>>>>>> 518b3cab39ab3f46cd019b871e71bcfddd414374
+    "obsidian-charts",
+    "obsidian-git",
+    "obsidian-activity-history",
+    "obsidian-gist",
+    "emoji-shortcodes",
+    "dataview",
+    "templater-obsidian",
+    "obsidian-mind-map",
+    "obsidian-outliner",
+    "obsidian-admonition",
+    "table-editor-obsidian",
+    "obsidian-auto-link-title",
+    "open-note-to-window-title",
+    "obsidian-autocomplete-plugin",
+    "code-block-copy",
+    "cycle-through-panes",
+    "cm-editor-syntax-highlight-obsidian",
+    "obsidian-emoji-toolbar",
+    "obsidian-filename-heading-sync",
+    "hotkey-helper",
+    "obsidian-icons-plugin",
+    "obsidian-kanban",
+    "url-into-selection",
+    "obsidian-plugin-toc",
+    "wikilinks-to-mdlinks-obsidian",
+    "obsidian-filename-heading-sync",
+    "obsidian-latex"
 ]
\ No newline at end of file
diff --git a/notes/.obsidian/graph.json b/notes/.obsidian/graph.json
index 3957f77..fb5a018 100644
--- a/notes/.obsidian/graph.json
+++ b/notes/.obsidian/graph.json
@@ -5,7 +5,7 @@
   "showAttachments": false,
   "hideUnresolved": false,
   "showOrphans": true,
-  "collapse-color-groups": true,
+  "collapse-color-groups": false,
   "colorGroups": [],
   "collapse-display": true,
   "showArrow": false,
@@ -17,6 +17,6 @@
   "repelStrength": 10,
   "linkStrength": 1,
   "linkDistance": 250,
-  "scale": 0.6063411463646815,
+  "scale": 0.7252549137423465,
   "close": false
 }
\ No newline at end of file
diff --git a/notes/.obsidian/plugins/obsidian-activity-history/data.json b/notes/.obsidian/plugins/obsidian-activity-history/data.json
index fb4cea4..ca17bf6 100644
--- a/notes/.obsidian/plugins/obsidian-activity-history/data.json
+++ b/notes/.obsidian/plugins/obsidian-activity-history/data.json
@@ -12,13 +12,8 @@
   "checkpointList": [
     {
       "path": "/",
-<<<<<<< HEAD
       "date": "2021-10-18",
-      "size": 40936
-=======
-      "date": "2021-10-14",
-      "size": 42797
->>>>>>> 518b3cab39ab3f46cd019b871e71bcfddd414374
+      "size": 42688
     }
   ],
   "activityHistory": [
@@ -87,27 +82,18 @@
         },
         {
           "date": "2021-10-04",
-          "value": 3282
+          "value": 3088
         },
         {
           "date": "2021-10-05",
-          "value": 661
+          "value": 0
         },
         {
           "date": "2021-10-06",
           "value": 0
         },
-        {
-          "date": "2021-10-08",
-          "value": 715
-        },
-        {
-          "date": "2021-10-09",
-          "value": 2175
-        },
         {
           "date": "2021-10-10",
-<<<<<<< HEAD
           "value": 4296
         },
         {
@@ -120,26 +106,7 @@
         },
         {
           "date": "2021-10-18",
-          "value": 0
-=======
-          "value": 52
-        },
-        {
-          "date": "2021-10-11",
-          "value": 2247
-        },
-        {
-          "date": "2021-10-12",
-          "value": 0
-        },
-        {
-          "date": "2021-10-13",
-          "value": 321
-        },
-        {
-          "date": "2021-10-14",
-          "value": 232
->>>>>>> 518b3cab39ab3f46cd019b871e71bcfddd414374
+          "value": 1752
         }
       ]
     }
diff --git a/notes/mat/ucitel.md b/notes/mat/ucitel.md
index 2f75e66..bde93b2 100644
--- a/notes/mat/ucitel.md
+++ b/notes/mat/ucitel.md
@@ -1 +1,3 @@
-# Tkáč
\ No newline at end of file
+
+# Tkáč
+Třída 312
\ No newline at end of file