vault backup: 2026-01-04 10:33:55
This commit is contained in:
windyboy
Vendored
+2
-1
@@ -23,5 +23,6 @@
|
||||
"omnisearch",
|
||||
"cmdr",
|
||||
"obsidian-tasks-plugin",
|
||||
"smart-connections"
|
||||
"smart-connections",
|
||||
"memos-sync"
|
||||
]
|
||||
+7
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"dailyMemosHeader": "000-inbox/Memos",
|
||||
"memosAPIVersion": "v0.24.0",
|
||||
"memosAPIURL": "https://memos.windy.me",
|
||||
"memosAPIToken": "eyJhbGciOiJIUzI1NiIsImtpZCI6InYxIiwidHlwIjoiSldUIn0.eyJuYW1lIjoiemhpcWlhbmciLCJpc3MiOiJtZW1vcyIsInN1YiI6IjEiLCJhdWQiOlsidXNlci5hY2Nlc3MtdG9rZW4iXSwiaWF0IjoxNzY3NDA0MzY0fQ.SR4a3nn3myQUiPV3tJGLpKs_XgpFaOM_aK0i2CmNGoY",
|
||||
"attachmentFolder": "Attachments"
|
||||
}
|
||||
Vendored
+23420
File diff suppressed because it is too large
Load Diff
+10
@@ -0,0 +1,10 @@
|
||||
{
|
||||
"id": "memos-sync",
|
||||
"name": "Memos Sync",
|
||||
"version": "0.5.2",
|
||||
"minAppVersion": "1.5.12",
|
||||
"description": "Syncing memos from a [Memos](https://github.com/usememos/memos) server to your daily note. Fully compatible with official Daily Notes plugin, Calendar plugin and Periodic Notes plugin.",
|
||||
"author": "RyoJerryYu",
|
||||
"authorUrl": "https://github.com/RyoJerryYu",
|
||||
"isDesktopOnly": true
|
||||
}
|
||||
+8
@@ -0,0 +1,8 @@
|
||||
/*
|
||||
|
||||
This CSS file will be included with your plugin, and
|
||||
available in the app when your plugin is enabled.
|
||||
|
||||
If your plugin does not need CSS, delete this file.
|
||||
|
||||
*/
|
||||
Vendored
+7
-22
@@ -4,39 +4,24 @@
|
||||
"type": "split",
|
||||
"children": [
|
||||
{
|
||||
"id": "24a6b53bf2557798",
|
||||
"id": "d21dc296bccb4add",
|
||||
"type": "tabs",
|
||||
"children": [
|
||||
{
|
||||
"id": "def54ecce4ded17c",
|
||||
"id": "0ed7e2b47382c9c6",
|
||||
"type": "leaf",
|
||||
"state": {
|
||||
"type": "markdown",
|
||||
"state": {
|
||||
"file": "100-project/AI/Manus/Manus 简介使用.md",
|
||||
"file": "000-inbox/clippings/2023/03/《软件供应商手册：SBOM的生成和提供》解读 - FreeBuf网络安全行业门户.md",
|
||||
"mode": "source",
|
||||
"source": false
|
||||
},
|
||||
"icon": "lucide-file",
|
||||
"title": "Manus 简介使用"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "10fa2a0fe62c3929",
|
||||
"type": "leaf",
|
||||
"state": {
|
||||
"type": "markdown",
|
||||
"state": {
|
||||
"file": "conflict-files-obsidian-git.md",
|
||||
"mode": "source",
|
||||
"source": false
|
||||
},
|
||||
"icon": "lucide-file",
|
||||
"title": "conflict-files-obsidian-git"
|
||||
"title": "《软件供应商手册：SBOM的生成和提供》解读 - FreeBuf网络安全行业门户"
|
||||
}
|
||||
}
|
||||
],
|
||||
"currentTab": 1
|
||||
]
|
||||
}
|
||||
],
|
||||
"direction": "vertical"
|
||||
@@ -269,8 +254,9 @@
|
||||
"smart-connections:Smart Connections: Open random connection": false
|
||||
}
|
||||
},
|
||||
"active": "10fa2a0fe62c3929",
|
||||
"active": "0ed7e2b47382c9c6",
|
||||
"lastOpenFiles": [
|
||||
"000-inbox/Memos",
|
||||
"100-project/AI/Manus/Manus 简介使用.md",
|
||||
"conflict-files-obsidian-git.md",
|
||||
"tests/__pycache__/test_package_structure.cpython-314-pytest-9.0.2.pyc",
|
||||
@@ -306,7 +292,6 @@
|
||||
"400-archive/_duplicates/System Architec/架构目标（Architecture Goals）.md",
|
||||
"400-archive/_duplicates/System Architec/决策方法.md",
|
||||
"400-archive/_duplicates/System Architec/产出（Deliverables）.md",
|
||||
"400-archive/_duplicates/System Architec/_README.md",
|
||||
"300-resources/Personal Knowledge Management/arc42/images/arc42-logo.png",
|
||||
"300-resources/Personal Knowledge Management/arc42/images/08-Crosscutting-Concepts-Structure-EN.png",
|
||||
"300-resources/Personal Knowledge Management/arc42/images/05_building_blocks-EN.png",
|
||||
|
||||
@@ -1,58 +1,35 @@
|
||||
"event_logs:settings:changed": {"key":"settings:changed","ct":11,"first_at":1766986874718,"last_at":1766986877791,"class_name":"EventLog"},
|
||||
"event_logs:event_log:first": {"key":"event_log:first","ct":3,"first_at":1767163587383,"last_at":1767163587458,"class_name":"EventLog"},
|
||||
"event_logs:source:initial_scan_started": {"key":"source:initial_scan_started","ct":1,"first_at":1767163587383,"last_at":1767163587383,"class_name":"EventLog"},
|
||||
"event_logs:source:initial_scan_completed": {"key":"source:initial_scan_completed","ct":1,"first_at":1767163587457,"last_at":1767163587457,"class_name":"EventLog"},
|
||||
"event_logs:collection:load_started": {"key":"collection:load_started","ct":9,"first_at":1766986877733,"last_at":1766994014452,"class_name":"EventLog"},
|
||||
"event_logs:collection:load_completed": {"key":"collection:load_completed","ct":5,"first_at":1766986877736,"last_at":1766994016401,"class_name":"EventLog"},
|
||||
"event_logs:collection:load_halted": {"key":"collection:load_halted","ct":5,"first_at":1766986877737,"last_at":1766994014446,"class_name":"EventLog"},
|
||||
"event_logs:sources:imported": {"key":"sources:imported","ct":1215,"first_at":1766986877786,"last_at":1766998685630,"class_name":"EventLog"},
|
||||
"event_logs:model:changed": {"key":"model:changed","ct":1,"first_at":1766986877791,"last_at":1766986877791,"class_name":"EventLog"},
|
||||
"event_logs:embed_model:load_failed": {"key":"embed_model:load_failed","ct":2,"first_at":1766986882626,"last_at":1766994021678,"class_name":"EventLog"},
|
||||
"event_logs:sources:import_completed": {"key":"sources:import_completed","ct":2,"first_at":1766986882852,"last_at":1766994021786,"class_name":"EventLog"},
|
||||
"event_logs:blocks:cleaned": {"key":"blocks:cleaned","ct":2,"first_at":1766986882899,"last_at":1766994021801,"class_name":"EventLog"},
|
||||
"event_logs:connections:opened": {"key":"connections:opened","ct":13,"first_at":1766986884102,"last_at":1766995048933,"class_name":"EventLog"},
|
||||
"event_logs:sources:created": {"key":"sources:created","ct":357,"first_at":1766987075389,"last_at":1766998533332,"class_name":"EventLog","event_sources":{"obsidian:vault.create":357}},
|
||||
"event_logs:sources:modified": {"key":"sources:modified","ct":609,"first_at":1766987077711,"last_at":1766998674635,"class_name":"EventLog","event_sources":{"obsidian:vault.modify":136,"obsidian:workspace.editor-change":473}},
|
||||
"event_logs:sources:deleted": {"key":"sources:deleted","ct":346,"first_at":1766987089766,"last_at":1766993568315,"class_name":"EventLog","event_sources":{"obsidian:vault.delete":346}},
|
||||
"event_logs:sources:opened": {"key":"sources:opened","ct":41,"first_at":1766987105710,"last_at":1766998610941,"class_name":"EventLog","event_sources":{"active-leaf-change":41}},
|
||||
"event_logs:sources:renamed": {"key":"sources:renamed","ct":1,"first_at":1766998541874,"last_at":1766998541874,"class_name":"EventLog","event_sources":{"obsidian:vault.rename":1}},
|
||||
"event_logs:event_log:first": {"key":"event_log:first","ct":3,"first_at":1767163587383,"last_at":1767163587458,"class_name":"EventLog"},
|
||||
"event_logs:settings:changed": {"key":"settings:changed","ct":8,"first_at":1767492337372,"last_at":1767492337447,"class_name":"EventLog"},
|
||||
"event_logs:event_log:first": {"key":"event_log:first","ct":4,"first_at":1767492337372,"last_at":1767492337445,"class_name":"EventLog"},
|
||||
"event_logs:source:initial_scan_started": {"key":"source:initial_scan_started","ct":1,"first_at":1767492337372,"last_at":1767492337372,"class_name":"EventLog"},
|
||||
"event_logs:source:initial_scan_completed": {"key":"source:initial_scan_completed","ct":1,"first_at":1767492337445,"last_at":1767492337445,"class_name":"EventLog"},
|
||||
"event_logs:collection:load_started": {"key":"collection:load_started","ct":13,"first_at":1766986877733,"last_at":1767163590474,"class_name":"EventLog"},
|
||||
"event_logs:collection:load_completed": {"key":"collection:load_completed","ct":8,"first_at":1766986877736,"last_at":1767163590699,"class_name":"EventLog"},
|
||||
"event_logs:collection:load_halted": {"key":"collection:load_halted","ct":7,"first_at":1766986877737,"last_at":1767163590473,"class_name":"EventLog"},
|
||||
"event_logs:sources:imported": {"key":"sources:imported","ct":1664,"first_at":1766986877786,"last_at":1767163590791,"class_name":"EventLog"},
|
||||
"event_logs:sources:imported": {"key":"sources:imported","ct":1882,"first_at":1766986877786,"last_at":1767170791265,"class_name":"EventLog"},
|
||||
"event_logs:model:changed": {"key":"model:changed","ct":1,"first_at":1766986877791,"last_at":1766986877791,"class_name":"EventLog"},
|
||||
"event_logs:embed_model:load_failed": {"key":"embed_model:load_failed","ct":3,"first_at":1766986882626,"last_at":1767163592342,"class_name":"EventLog"},
|
||||
"event_logs:sources:import_completed": {"key":"sources:import_completed","ct":3,"first_at":1766986882852,"last_at":1767163592384,"class_name":"EventLog"},
|
||||
"event_logs:blocks:cleaned": {"key":"blocks:cleaned","ct":3,"first_at":1766986882899,"last_at":1767163592386,"class_name":"EventLog"},
|
||||
"event_logs:sources:created": {"key":"sources:created","ct":358,"first_at":1766987075389,"last_at":1767163605118,"class_name":"EventLog","event_sources":{"obsidian:vault.create":358}},
|
||||
"event_logs:sources:renamed": {"key":"sources:renamed","ct":2,"first_at":1766998541874,"last_at":1767163608996,"class_name":"EventLog","event_sources":{"obsidian:vault.rename":2}},
|
||||
"event_logs:sources:created": {"key":"sources:created","ct":359,"first_at":1766987075389,"last_at":1767163612741,"class_name":"EventLog","event_sources":{"obsidian:vault.create":359}},
|
||||
"event_logs:sources:opened": {"key":"sources:opened","ct":42,"first_at":1766987105710,"last_at":1767163612778,"class_name":"EventLog","event_sources":{"active-leaf-change":42}},
|
||||
"event_logs:sources:imported": {"key":"sources:imported","ct":1665,"first_at":1766986877786,"last_at":1767163625908,"class_name":"EventLog"},
|
||||
"event_logs:sources:modified": {"key":"sources:modified","ct":611,"first_at":1766987077711,"last_at":1767163633724,"class_name":"EventLog","event_sources":{"obsidian:vault.modify":136,"obsidian:workspace.editor-change":475}},
|
||||
"event_logs:sources:modified": {"key":"sources:modified","ct":612,"first_at":1766987077711,"last_at":1767163635708,"class_name":"EventLog","event_sources":{"obsidian:vault.modify":137,"obsidian:workspace.editor-change":475}},
|
||||
"event_logs:sources:modified": {"key":"sources:modified","ct":629,"first_at":1766987077711,"last_at":1767163645018,"class_name":"EventLog","event_sources":{"obsidian:vault.modify":137,"obsidian:workspace.editor-change":492}},
|
||||
"event_logs:sources:imported": {"key":"sources:imported","ct":1666,"first_at":1766986877786,"last_at":1767163646711,"class_name":"EventLog"},
|
||||
"event_logs:sources:modified": {"key":"sources:modified","ct":639,"first_at":1766987077711,"last_at":1767163648423,"class_name":"EventLog","event_sources":{"obsidian:vault.modify":139,"obsidian:workspace.editor-change":500}},
|
||||
"event_logs:sources:modified": {"key":"sources:modified","ct":641,"first_at":1766987077711,"last_at":1767163651281,"class_name":"EventLog","event_sources":{"obsidian:vault.modify":139,"obsidian:workspace.editor-change":502}},
|
||||
"event_logs:sources:modified": {"key":"sources:modified","ct":654,"first_at":1766987077711,"last_at":1767163655475,"class_name":"EventLog","event_sources":{"obsidian:vault.modify":140,"obsidian:workspace.editor-change":514}},
|
||||
"event_logs:sources:modified": {"key":"sources:modified","ct":655,"first_at":1766987077711,"last_at":1767163657373,"class_name":"EventLog","event_sources":{"obsidian:vault.modify":141,"obsidian:workspace.editor-change":514}},
|
||||
"event_logs:sources:imported": {"key":"sources:imported","ct":1667,"first_at":1766986877786,"last_at":1767163659797,"class_name":"EventLog"},
|
||||
"event_logs:sources:modified": {"key":"sources:modified","ct":669,"first_at":1766987077711,"last_at":1767163661635,"class_name":"EventLog","event_sources":{"obsidian:vault.modify":142,"obsidian:workspace.editor-change":527}},
|
||||
"event_logs:sources:modified": {"key":"sources:modified","ct":679,"first_at":1766987077711,"last_at":1767163664338,"class_name":"EventLog","event_sources":{"obsidian:vault.modify":143,"obsidian:workspace.editor-change":536}},
|
||||
"event_logs:sources:modified": {"key":"sources:modified","ct":680,"first_at":1766987077711,"last_at":1767163665518,"class_name":"EventLog","event_sources":{"obsidian:vault.modify":144,"obsidian:workspace.editor-change":536}},
|
||||
"event_logs:sources:modified": {"key":"sources:modified","ct":682,"first_at":1766987077711,"last_at":1767163669779,"class_name":"EventLog","event_sources":{"obsidian:vault.modify":144,"obsidian:workspace.editor-change":538}},
|
||||
"event_logs:sources:modified": {"key":"sources:modified","ct":688,"first_at":1766987077711,"last_at":1767163671707,"class_name":"EventLog","event_sources":{"obsidian:vault.modify":145,"obsidian:workspace.editor-change":543}},
|
||||
"event_logs:sources:imported": {"key":"sources:imported","ct":1668,"first_at":1766986877786,"last_at":1767163673215,"class_name":"EventLog"},
|
||||
"event_logs:sources:modified": {"key":"sources:modified","ct":693,"first_at":1766987077711,"last_at":1767163674582,"class_name":"EventLog","event_sources":{"obsidian:vault.modify":145,"obsidian:workspace.editor-change":548}},
|
||||
"event_logs:sources:modified": {"key":"sources:modified","ct":695,"first_at":1766987077711,"last_at":1767163675964,"class_name":"EventLog","event_sources":{"obsidian:vault.modify":146,"obsidian:workspace.editor-change":549}},
|
||||
"event_logs:sources:modified": {"key":"sources:modified","ct":696,"first_at":1766987077711,"last_at":1767163677967,"class_name":"EventLog","event_sources":{"obsidian:vault.modify":147,"obsidian:workspace.editor-change":549}},
|
||||
"event_logs:sources:renamed": {"key":"sources:renamed","ct":3,"first_at":1766998541874,"last_at":1767163684484,"class_name":"EventLog","event_sources":{"obsidian:vault.rename":3}},
|
||||
"event_logs:sources:modified": {"key":"sources:modified","ct":698,"first_at":1766987077711,"last_at":1767163687474,"class_name":"EventLog","event_sources":{"obsidian:vault.modify":147,"obsidian:workspace.editor-change":551}},
|
||||
"event_logs:sources:modified": {"key":"sources:modified","ct":699,"first_at":1766987077711,"last_at":1767163688850,"class_name":"EventLog","event_sources":{"obsidian:vault.modify":148,"obsidian:workspace.editor-change":551}},
|
||||
"event_logs:sources:imported": {"key":"sources:imported","ct":1670,"first_at":1766986877786,"last_at":1767163697507,"class_name":"EventLog"},
|
||||
"event_logs:connections:opened": {"key":"connections:opened","ct":13,"first_at":1766986884102,"last_at":1766995048933,"class_name":"EventLog"},
|
||||
"event_logs:sources:created": {"key":"sources:created","ct":598,"first_at":1766987075389,"last_at":1767170770210,"class_name":"EventLog","event_sources":{"obsidian:vault.create":598}},
|
||||
"event_logs:sources:modified": {"key":"sources:modified","ct":722,"first_at":1766987077711,"last_at":1767170769899,"class_name":"EventLog","event_sources":{"obsidian:vault.modify":171,"obsidian:workspace.editor-change":551}},
|
||||
"event_logs:sources:deleted": {"key":"sources:deleted","ct":356,"first_at":1766987089766,"last_at":1767170771066,"class_name":"EventLog","event_sources":{"obsidian:vault.delete":356}},
|
||||
"event_logs:sources:deleted": {"key":"sources:deleted","ct":357,"first_at":1766987089766,"last_at":1767170795682,"class_name":"EventLog","event_sources":{"obsidian:vault.delete":357}},
|
||||
"event_logs:sources:opened": {"key":"sources:opened","ct":43,"first_at":1766987105710,"last_at":1767170772447,"class_name":"EventLog","event_sources":{"active-leaf-change":43}},
|
||||
"event_logs:sources:imported": {"key":"sources:imported","ct":1882,"first_at":1766986877786,"last_at":1767170791265,"class_name":"EventLog"},
|
||||
"event_logs:sources:renamed": {"key":"sources:renamed","ct":3,"first_at":1766998541874,"last_at":1767163684484,"class_name":"EventLog","event_sources":{"obsidian:vault.rename":3}},
|
||||
"event_logs:event_log:first": {"key":"event_log:first","ct":4,"first_at":1767492337372,"last_at":1767492337445,"class_name":"EventLog"},
|
||||
"event_logs:collection:load_started": {"key":"collection:load_started","ct":13,"first_at":1766986877733,"last_at":1767163590474,"class_name":"EventLog"},
|
||||
"event_logs:settings:changed": {"key":"settings:changed","ct":11,"first_at":1767492337372,"last_at":1767492342665,"class_name":"EventLog"},
|
||||
"event_logs:collection:load_started": {"key":"collection:load_started","ct":17,"first_at":1766986877733,"last_at":1767492342193,"class_name":"EventLog"},
|
||||
"event_logs:collection:load_completed": {"key":"collection:load_completed","ct":10,"first_at":1766986877736,"last_at":1767492342660,"class_name":"EventLog"},
|
||||
"event_logs:collection:load_halted": {"key":"collection:load_halted","ct":10,"first_at":1766986877737,"last_at":1767492342193,"class_name":"EventLog"},
|
||||
"event_logs:sources:imported": {"key":"sources:imported","ct":2512,"first_at":1766986877786,"last_at":1767492345363,"class_name":"EventLog"},
|
||||
"event_logs:model:changed": {"key":"model:changed","ct":2,"first_at":1766986877791,"last_at":1767492342665,"class_name":"EventLog"},
|
||||
"event_logs:embed_model:load_failed": {"key":"embed_model:load_failed","ct":4,"first_at":1766986882626,"last_at":1767492347020,"class_name":"EventLog"},
|
||||
"event_logs:sources:import_completed": {"key":"sources:import_completed","ct":4,"first_at":1766986882852,"last_at":1767492347250,"class_name":"EventLog"},
|
||||
"event_logs:blocks:cleaned": {"key":"blocks:cleaned","ct":4,"first_at":1766986882899,"last_at":1767492347303,"class_name":"EventLog"},
|
||||
"event_logs:event_log:first": {"key":"event_log:first","ct":5,"first_at":1767492337372,"last_at":1767492351211,"class_name":"EventLog"},
|
||||
"event_logs:plugin:new_version_available": {"key":"plugin:new_version_available","ct":1,"first_at":1767492351211,"last_at":1767492351211,"class_name":"EventLog"},
|
||||
"event_logs:sources:created": {"key":"sources:created","ct":599,"first_at":1766987075389,"last_at":1767492820300,"class_name":"EventLog","event_sources":{"obsidian:vault.create":599}},
|
||||
"event_logs:sources:renamed": {"key":"sources:renamed","ct":4,"first_at":1766998541874,"last_at":1767492823208,"class_name":"EventLog","event_sources":{"obsidian:vault.rename":4}},
|
||||
"event_logs:sources:opened": {"key":"sources:opened","ct":44,"first_at":1766987105710,"last_at":1767492830312,"class_name":"EventLog","event_sources":{"active-leaf-change":44}},
|
||||
"event_logs:sources:deleted": {"key":"sources:deleted","ct":362,"first_at":1766987089766,"last_at":1767493491926,"class_name":"EventLog","event_sources":{"obsidian:vault.delete":362}},
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,2 +0,0 @@
|
||||
[[ReadItLater]] [[Textsnippet]]
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
[[ReadItLater]] [[Textsnippet]]
|
||||
|
||||
@@ -1,38 +0,0 @@
|
||||
# Conflicts
|
||||
Please resolve them and commit them using the commands `Git: Commit all changes` followed by `Git: Push`
|
||||
(This file will automatically be deleted before commit)
|
||||
[[#Additional Instructions]] available below file list
|
||||
|
||||
- Not a file: .obsidian/workspace.json
|
||||
- Not a file: .smart-env/event_logs/event_logs.ajson
|
||||
- Not a file: .smart-env/multi/200-area_Blog_Blog_md.ajson
|
||||
- Not a file: .smart-env/multi/200-area_Finance_Finance_md.ajson
|
||||
- Not a file: .smart-env/multi/200-area_Health_Health_md.ajson
|
||||
- Not a file: .smart-env/multi/200-area_Health_自行车_md.ajson
|
||||
- Not a file: .smart-env/multi/200-area_House_Brand_and_models_md.ajson
|
||||
- Not a file: .smart-env/multi/200-area_House_House_md.ajson
|
||||
- Not a file: .smart-env/multi/200-area_Personal_Development_Design_Your_Habits_md.ajson
|
||||
- Not a file: .smart-env/multi/200-area_Personal_Development_Personal_Development_md.ajson
|
||||
- Not a file: .smart-env/multi/200-area_Productivity_Productivity_md.ajson
|
||||
- Not a file: .smart-env/multi/200-area_Productivity_Task_triage_md.ajson
|
||||
- Not a file: .smart-env/multi/300-resources_Community_Community_md.ajson
|
||||
- Not a file: .smart-env/multi/300-resources_Cooking_Cooking_md.ajson
|
||||
- Not a file: .smart-env/multi/300-resources_Development_Development_md.ajson
|
||||
- Not a file: .smart-env/multi/300-resources_Drawing_Drawing_md.ajson
|
||||
- Not a file: .smart-env/multi/300-resources_Gaming_Gaming_md.ajson
|
||||
- Not a file: .smart-env/multi/300-resources_Marketing_Marketing_md.ajson
|
||||
- Not a file: .smart-env/multi/300-resources_Personal_Knowledge_Management_Personal_Knowledge_Management_md.ajson
|
||||
- Not a file: .smart-env/multi/300-resources_Productivity_Productivity_md.ajson
|
||||
- Not a file: .smart-env/multi/300-resources_Travel_Travel_md.ajson
|
||||
- Not a file: .smart-env/multi/300-resources_Writing_Writing_md.ajson
|
||||
|
||||
# Additional Instructions
|
||||
I strongly recommend to use "Source mode" for viewing the conflicted files. For simple conflicts, in each file listed above replace every occurrence of the following text blocks with the desired text.
|
||||
|
||||
```diff
|
||||
<<<<<<< HEAD
|
||||
File changes in local repository
|
||||
=======
|
||||
File changes in remote repository
|
||||
>>>>>>> origin/main
|
||||
```
|
||||
Reference in New Issue
Block a user