|
@@ -1,55 +1,24 @@
|
|
{
|
|
{
|
|
"main": {
|
|
"main": {
|
|
- "id": "457099876b72cb58",
|
|
|
|
|
|
+ "id": "702c86104f0a0629",
|
|
"type": "split",
|
|
"type": "split",
|
|
"children": [
|
|
"children": [
|
|
{
|
|
{
|
|
- "id": "4d10126bdbb751c1",
|
|
|
|
|
|
+ "id": "3052bd378c6b8585",
|
|
"type": "tabs",
|
|
"type": "tabs",
|
|
"children": [
|
|
"children": [
|
|
{
|
|
{
|
|
-<<<<<<< HEAD
|
|
|
|
- "id": "38ab71b6e7063edb",
|
|
|
|
|
|
+ "id": "621ee72e7291fc4c",
|
|
"type": "leaf",
|
|
"type": "leaf",
|
|
"state": {
|
|
"state": {
|
|
"type": "markdown",
|
|
"type": "markdown",
|
|
"state": {
|
|
"state": {
|
|
- "file": "hardcore web development/4. Linux.md",
|
|
|
|
|
|
+ "file": "ROTEK/bt6714.md",
|
|
"mode": "source",
|
|
"mode": "source",
|
|
"source": false
|
|
"source": false
|
|
},
|
|
},
|
|
"icon": "lucide-file",
|
|
"icon": "lucide-file",
|
|
- "title": "4. Linux"
|
|
|
|
- }
|
|
|
|
- },
|
|
|
|
- {
|
|
|
|
-=======
|
|
|
|
->>>>>>> ae64701e9d8fccd343964c18a6d93170717baa9d
|
|
|
|
- "id": "5e9457fc4512abce",
|
|
|
|
- "type": "leaf",
|
|
|
|
- "state": {
|
|
|
|
- "type": "markdown",
|
|
|
|
- "state": {
|
|
|
|
- "file": "proGit.md",
|
|
|
|
- "mode": "source",
|
|
|
|
- "source": false
|
|
|
|
- },
|
|
|
|
- "icon": "lucide-file",
|
|
|
|
- "title": "proGit"
|
|
|
|
- }
|
|
|
|
- },
|
|
|
|
- {
|
|
|
|
- "id": "7ab3c9d37cda9f56",
|
|
|
|
- "type": "leaf",
|
|
|
|
- "state": {
|
|
|
|
- "type": "markdown",
|
|
|
|
- "state": {
|
|
|
|
- "file": "Python/venv.md",
|
|
|
|
- "mode": "source",
|
|
|
|
- "source": false
|
|
|
|
- },
|
|
|
|
- "icon": "lucide-file",
|
|
|
|
- "title": "venv"
|
|
|
|
|
|
+ "title": "bt6714"
|
|
}
|
|
}
|
|
}
|
|
}
|
|
]
|
|
]
|
|
@@ -58,15 +27,15 @@
|
|
"direction": "vertical"
|
|
"direction": "vertical"
|
|
},
|
|
},
|
|
"left": {
|
|
"left": {
|
|
- "id": "f51da980e597e4bf",
|
|
|
|
|
|
+ "id": "6664e9908eeea5a2",
|
|
"type": "split",
|
|
"type": "split",
|
|
"children": [
|
|
"children": [
|
|
{
|
|
{
|
|
- "id": "a556038c46a7977d",
|
|
|
|
|
|
+ "id": "97095e32830cbc6f",
|
|
"type": "tabs",
|
|
"type": "tabs",
|
|
"children": [
|
|
"children": [
|
|
{
|
|
{
|
|
- "id": "884c372182594a32",
|
|
|
|
|
|
+ "id": "c7584343712d3d31",
|
|
"type": "leaf",
|
|
"type": "leaf",
|
|
"state": {
|
|
"state": {
|
|
"type": "file-explorer",
|
|
"type": "file-explorer",
|
|
@@ -78,7 +47,7 @@
|
|
}
|
|
}
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- "id": "68837d15a9a0fb86",
|
|
|
|
|
|
+ "id": "e389aabe146b0498",
|
|
"type": "leaf",
|
|
"type": "leaf",
|
|
"state": {
|
|
"state": {
|
|
"type": "search",
|
|
"type": "search",
|
|
@@ -91,40 +60,40 @@
|
|
"sortOrder": "alphabetical"
|
|
"sortOrder": "alphabetical"
|
|
},
|
|
},
|
|
"icon": "lucide-search",
|
|
"icon": "lucide-search",
|
|
- "title": "Поиск"
|
|
|
|
|
|
+ "title": "Search"
|
|
}
|
|
}
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- "id": "90af6dd533b4c073",
|
|
|
|
|
|
+ "id": "9cc940b45c7a4595",
|
|
"type": "leaf",
|
|
"type": "leaf",
|
|
"state": {
|
|
"state": {
|
|
"type": "bookmarks",
|
|
"type": "bookmarks",
|
|
"state": {},
|
|
"state": {},
|
|
"icon": "lucide-bookmark",
|
|
"icon": "lucide-bookmark",
|
|
- "title": "Закладки"
|
|
|
|
|
|
+ "title": "Bookmarks"
|
|
}
|
|
}
|
|
}
|
|
}
|
|
]
|
|
]
|
|
}
|
|
}
|
|
],
|
|
],
|
|
"direction": "horizontal",
|
|
"direction": "horizontal",
|
|
- "width": 243.5
|
|
|
|
|
|
+ "width": 200
|
|
},
|
|
},
|
|
"right": {
|
|
"right": {
|
|
- "id": "59ef55f9157a7243",
|
|
|
|
|
|
+ "id": "cf92ccf43e96a53d",
|
|
"type": "split",
|
|
"type": "split",
|
|
"children": [
|
|
"children": [
|
|
{
|
|
{
|
|
- "id": "7e25416087f8bf68",
|
|
|
|
|
|
+ "id": "4e6c94e5301f3341",
|
|
"type": "tabs",
|
|
"type": "tabs",
|
|
"children": [
|
|
"children": [
|
|
{
|
|
{
|
|
- "id": "757c6e28c063c79d",
|
|
|
|
|
|
+ "id": "86c23330f2a84cf8",
|
|
"type": "leaf",
|
|
"type": "leaf",
|
|
"state": {
|
|
"state": {
|
|
"type": "backlink",
|
|
"type": "backlink",
|
|
"state": {
|
|
"state": {
|
|
- "file": "todo/Задачи по направлениям.md",
|
|
|
|
|
|
+ "file": "proGit.md",
|
|
"collapseAll": false,
|
|
"collapseAll": false,
|
|
"extraContext": false,
|
|
"extraContext": false,
|
|
"sortOrder": "alphabetical",
|
|
"sortOrder": "alphabetical",
|
|
@@ -134,11 +103,11 @@
|
|
"unlinkedCollapsed": true
|
|
"unlinkedCollapsed": true
|
|
},
|
|
},
|
|
"icon": "links-coming-in",
|
|
"icon": "links-coming-in",
|
|
- "title": "Обратные ссылки для Задачи по направлениям"
|
|
|
|
|
|
+ "title": "Backlinks for proGit"
|
|
}
|
|
}
|
|
},
|
|
},
|
|
{
|
|
{
|
|
- "id": "c4fdc90cee0f60ee",
|
|
|
|
|
|
+ "id": "06e27be0fe382bd8",
|
|
"type": "leaf",
|
|
"type": "leaf",
|
|
"state": {
|
|
"state": {
|
|
"type": "all-properties",
|
|
"type": "all-properties",
|
|
@@ -148,7 +117,7 @@
|
|
"searchQuery": ""
|
|
"searchQuery": ""
|
|
},
|
|
},
|
|
"icon": "lucide-archive",
|
|
"icon": "lucide-archive",
|
|
- "title": "Все свойства"
|
|
|
|
|
|
+ "title": "All properties"
|
|
}
|
|
}
|
|
}
|
|
}
|
|
]
|
|
]
|
|
@@ -167,57 +136,11 @@
|
|
"markdown-importer:Open format converter": false
|
|
"markdown-importer:Open format converter": false
|
|
}
|
|
}
|
|
},
|
|
},
|
|
- "active": "5e9457fc4512abce",
|
|
|
|
|
|
+ "active": "621ee72e7291fc4c",
|
|
"lastOpenFiles": [
|
|
"lastOpenFiles": [
|
|
-<<<<<<< HEAD
|
|
|
|
- "Database.kdbx.tmp",
|
|
|
|
- "linux/linux common.md",
|
|
|
|
- "Python/venv.md",
|
|
|
|
- "todo/Счета.md",
|
|
|
|
- "todo/Разное.md",
|
|
|
|
-=======
|
|
|
|
- "Django/common.md",
|
|
|
|
- "Python/venv.md",
|
|
|
|
- "hardcore web development/4. Linux.md",
|
|
|
|
->>>>>>> ae64701e9d8fccd343964c18a6d93170717baa9d
|
|
|
|
- "todo/Задачи по направлениям.md",
|
|
|
|
- "todo/Тренировки и занятия.md",
|
|
|
|
- "todo/Счета.md",
|
|
|
|
- "English/img/2-2.jpg",
|
|
|
|
- "Django",
|
|
|
|
- "English/img/2-3.jpg",
|
|
|
|
- "English/Homework.md",
|
|
|
|
- "todo/Разное.md",
|
|
|
|
- "Python/function основное.md",
|
|
|
|
- "English/img/1-9.jpg",
|
|
|
|
- "English/img/1-8.jpg",
|
|
|
|
- "English/img/1-7.jpg",
|
|
|
|
- "English/img/1-6.jpg",
|
|
|
|
- "English/img/1-5.jpg",
|
|
|
|
- "English/img/1-4.jpg",
|
|
|
|
- "English/img/1-3.jpg",
|
|
|
|
- "English/img/1-2.jpg",
|
|
|
|
-<<<<<<< HEAD
|
|
|
|
- "English/img/1-1.jpg",
|
|
|
|
- "todo/Тренировки и занятия.md",
|
|
|
|
-=======
|
|
|
|
->>>>>>> ae64701e9d8fccd343964c18a6d93170717baa9d
|
|
|
|
- "English/Text 2.md",
|
|
|
|
- "ROTEK/bt67xx/common.md",
|
|
|
|
- "linux/Tmux.md",
|
|
|
|
- "linux/server.md",
|
|
|
|
- "c/GDB.md",
|
|
|
|
- "linux/bash.md",
|
|
|
|
- "linux/Raspberry PI.md",
|
|
|
|
- "docs/MEGA 通讯协议.pdf",
|
|
|
|
|
|
+ "English/img/Dialogue_4.jpg",
|
|
"proGit.md",
|
|
"proGit.md",
|
|
- "STM32/build.md",
|
|
|
|
- "STM32/IRQ + FreeRTOS.md",
|
|
|
|
- "linux/make.md",
|
|
|
|
- "c/c common.md",
|
|
|
|
- "c/syscalls.md",
|
|
|
|
- "ROTEK/universal IO/tasks.md",
|
|
|
|
- "Python/sort.md",
|
|
|
|
- "Python/lambda.md"
|
|
|
|
|
|
+ "Django/common.md",
|
|
|
|
+ "Python/venv.md"
|
|
]
|
|
]
|
|
}
|
|
}
|