|
|
@@ -13,7 +13,11 @@
|
|
|
"state": {
|
|
|
"type": "markdown",
|
|
|
"state": {
|
|
|
+<<<<<<< HEAD
|
|
|
"file": "proGit.md",
|
|
|
+=======
|
|
|
+ "file": "linux/bash.md",
|
|
|
+>>>>>>> 8060681e424598740c5696401c80bc37a5a44ed6
|
|
|
"mode": "source",
|
|
|
"source": false
|
|
|
}
|
|
|
@@ -85,7 +89,11 @@
|
|
|
"state": {
|
|
|
"type": "backlink",
|
|
|
"state": {
|
|
|
+<<<<<<< HEAD
|
|
|
"file": "proGit.md",
|
|
|
+=======
|
|
|
+ "file": "linux/bash.md",
|
|
|
+>>>>>>> 8060681e424598740c5696401c80bc37a5a44ed6
|
|
|
"collapseAll": false,
|
|
|
"extraContext": false,
|
|
|
"sortOrder": "alphabetical",
|
|
|
@@ -124,6 +132,55 @@
|
|
|
"markdown-importer:Open format converter": false
|
|
|
}
|
|
|
},
|
|
|
+<<<<<<< HEAD
|
|
|
"active": "4b307134b450d3bf",
|
|
|
"lastOpenFiles": []
|
|
|
+=======
|
|
|
+ "active": "4f8b822ecf1ab6df",
|
|
|
+ "lastOpenFiles": [
|
|
|
+ "linux/alacritty.md",
|
|
|
+ "hardcore web development/4. Linux.md",
|
|
|
+ "linux/linux common.md",
|
|
|
+ "linux/GS server.md",
|
|
|
+ "linux/server.md",
|
|
|
+ "TODO.md",
|
|
|
+ "Тренировки и занятия.md",
|
|
|
+ "linux/vim.md",
|
|
|
+ "linux/bash.md",
|
|
|
+ "ROTEK/universal IO/universal IO.md",
|
|
|
+ "Счета.md",
|
|
|
+ "linux/Tmux.md",
|
|
|
+ "proGit.md",
|
|
|
+ "FlyElectronics/LT8920.md",
|
|
|
+ "ROTEK/RT-701/common.md",
|
|
|
+ "Database.kdbx.SnMcza",
|
|
|
+ "hardcore web development/5-6-7 Internet.md",
|
|
|
+ "hardcore web development/9. Сессии, cookies, безопасность.md",
|
|
|
+ "STM32/build.md",
|
|
|
+ "STM32/IRQ + FreeRTOS.md",
|
|
|
+ "ROTEK/metrolog/readme.md",
|
|
|
+ "ROTEK/metrolog/M3 artery + stm32.md",
|
|
|
+ "ROTEK/metrolog/Текучка Метролог.md",
|
|
|
+ "ROTEK/bt67xx/common.md",
|
|
|
+ "FlyElectronics/Drone.md",
|
|
|
+ "configs/alacritty.toml",
|
|
|
+ "FlyElectronics/Grinding machine.md",
|
|
|
+ "Разное.md",
|
|
|
+ "keys/dtelenkov.key",
|
|
|
+ "keys/dtelenkov.crt",
|
|
|
+ "STM32",
|
|
|
+ "configs/wg0.conf",
|
|
|
+ "keys/wg.conf",
|
|
|
+ "keys/Новый текстовый документ.txt",
|
|
|
+ "keys/dmt_server.pub",
|
|
|
+ "keys/dmt_server",
|
|
|
+ "img/Pasted image 20240518111756.png",
|
|
|
+ "img/Pasted image 20240424185826.png",
|
|
|
+ "img/Pasted image 20240415124521.png",
|
|
|
+ "img/Pasted image 20240415124210.png",
|
|
|
+ "img/Pasted image 20240415123611.png",
|
|
|
+ "img/Pasted image 20240415122028.png",
|
|
|
+ "img/sch04.JPG"
|
|
|
+ ]
|
|
|
+>>>>>>> 8060681e424598740c5696401c80bc37a5a44ed6
|
|
|
}
|
