Merge branch 'master' of http://37.252.12.59/Home/obsidian

.obsidian/workspace.json

@@ -46,13 +46,8 @@
             "state": {
               "type": "markdown",
               "state": {
-<<<<<<< HEAD
-                "file": "Разное.md",
-                "mode": "preview",
-=======
                 "file": "FlyElectronics/LT8920.md",
                 "mode": "source",
->>>>>>> eaccb0f9c7774d3f872280adbb1e32a3348995d3
                 "source": false
               }
             },
@@ -163,16 +158,6 @@
   },
   "active": "010675dc9d7def04",
   "lastOpenFiles": [
-<<<<<<< HEAD
-    "Счета.md",
-    "Artery testing.md",
-    "TODO.md",
-    "proGit.md",
-    "linux/Arbiter.md",
-    "FlyElectronics/LT8920.md",
-    "linux/Raspberry PI.md",
-    "linux/linux common.md",
-=======
     "linux/Raspberry PI.md",
     "docs/LT8920datasheetEngversion201701191.pdf",
     "linux/linux common.md",