mirror of
https://github.com/danbulant/notes
synced 2026-05-24 12:35:57 +00:00
merge
This commit is contained in:
parent
06280359fe
commit
d91bfa37c6
4 changed files with 36 additions and 70 deletions
5
notes/.obsidian/community-plugins.json
vendored
5
notes/.obsidian/community-plugins.json
vendored
|
|
@ -12,7 +12,6 @@
|
||||||
"table-editor-obsidian",
|
"table-editor-obsidian",
|
||||||
"obsidian-auto-link-title",
|
"obsidian-auto-link-title",
|
||||||
"open-note-to-window-title",
|
"open-note-to-window-title",
|
||||||
<<<<<<< HEAD
|
|
||||||
"obsidian-autocomplete-plugin",
|
"obsidian-autocomplete-plugin",
|
||||||
"code-block-copy",
|
"code-block-copy",
|
||||||
"cycle-through-panes",
|
"cycle-through-panes",
|
||||||
|
|
@ -24,9 +23,7 @@
|
||||||
"obsidian-kanban",
|
"obsidian-kanban",
|
||||||
"url-into-selection",
|
"url-into-selection",
|
||||||
"obsidian-plugin-toc",
|
"obsidian-plugin-toc",
|
||||||
"wikilinks-to-mdlinks-obsidian"
|
"wikilinks-to-mdlinks-obsidian",
|
||||||
=======
|
|
||||||
"obsidian-filename-heading-sync",
|
"obsidian-filename-heading-sync",
|
||||||
"obsidian-latex"
|
"obsidian-latex"
|
||||||
>>>>>>> 518b3cab39ab3f46cd019b871e71bcfddd414374
|
|
||||||
]
|
]
|
||||||
4
notes/.obsidian/graph.json
vendored
4
notes/.obsidian/graph.json
vendored
|
|
@ -5,7 +5,7 @@
|
||||||
"showAttachments": false,
|
"showAttachments": false,
|
||||||
"hideUnresolved": false,
|
"hideUnresolved": false,
|
||||||
"showOrphans": true,
|
"showOrphans": true,
|
||||||
"collapse-color-groups": true,
|
"collapse-color-groups": false,
|
||||||
"colorGroups": [],
|
"colorGroups": [],
|
||||||
"collapse-display": true,
|
"collapse-display": true,
|
||||||
"showArrow": false,
|
"showArrow": false,
|
||||||
|
|
@ -17,6 +17,6 @@
|
||||||
"repelStrength": 10,
|
"repelStrength": 10,
|
||||||
"linkStrength": 1,
|
"linkStrength": 1,
|
||||||
"linkDistance": 250,
|
"linkDistance": 250,
|
||||||
"scale": 0.6063411463646815,
|
"scale": 0.7252549137423465,
|
||||||
"close": false
|
"close": false
|
||||||
}
|
}
|
||||||
|
|
@ -12,13 +12,8 @@
|
||||||
"checkpointList": [
|
"checkpointList": [
|
||||||
{
|
{
|
||||||
"path": "/",
|
"path": "/",
|
||||||
<<<<<<< HEAD
|
|
||||||
"date": "2021-10-18",
|
"date": "2021-10-18",
|
||||||
"size": 40936
|
"size": 42688
|
||||||
=======
|
|
||||||
"date": "2021-10-14",
|
|
||||||
"size": 42797
|
|
||||||
>>>>>>> 518b3cab39ab3f46cd019b871e71bcfddd414374
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"activityHistory": [
|
"activityHistory": [
|
||||||
|
|
@ -87,27 +82,18 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"date": "2021-10-04",
|
"date": "2021-10-04",
|
||||||
"value": 3282
|
"value": 3088
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"date": "2021-10-05",
|
"date": "2021-10-05",
|
||||||
"value": 661
|
"value": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"date": "2021-10-06",
|
"date": "2021-10-06",
|
||||||
"value": 0
|
"value": 0
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"date": "2021-10-08",
|
|
||||||
"value": 715
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"date": "2021-10-09",
|
|
||||||
"value": 2175
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"date": "2021-10-10",
|
"date": "2021-10-10",
|
||||||
<<<<<<< HEAD
|
|
||||||
"value": 4296
|
"value": 4296
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
@ -120,26 +106,7 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"date": "2021-10-18",
|
"date": "2021-10-18",
|
||||||
"value": 0
|
"value": 1752
|
||||||
=======
|
|
||||||
"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
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1 +1,3 @@
|
||||||
|
|
||||||
# Tkáč
|
# Tkáč
|
||||||
|
Třída 312
|
||||||
Loading…
Reference in a new issue