mbozoyan/vault
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve merge conflict by removing workspace.json

Browse Source
This commit is contained in:
mbozoyan
2026-08-11 03:11:33 +04:00
parent b9ef5700d6 3cd4b9c9ad
commit 5cdb0d437d
6 changed files with 189 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.obsidian/plugins/obsidian-git/data.json
Vendored
+2 -2
View File
@@ -6,7 +6,7 @@
"autoSaveInterval": 1,
"autoPushInterval": 1,
"autoPullInterval": 1,
"autoPullOnBoot": false,
"autoPullOnBoot": true,
"autoCommitOnlyStaged": false,
"disablePush": false,
"pullBeforePush": true,
@@ -21,7 +21,7 @@
"customMessageOnAutoBackup": false,
"autoBackupAfterFileChange": true,
"treeStructure": false,
"refreshSourceControl": true,
"refreshSourceControl": false,
"basePath": "",
"differentIntervalCommitAndPush": true,
"changedFilesInStatusBar": false,
.obsidian/workspace-mobile.json
Vendored
+182
View File
@@ -0,0 +1,182 @@
{
"main": {
"id": "ebc58869f7edbd9f",
"type": "split",
"children": [
{
"id": "5f784bbb8a4b4455",
"type": "tabs",
"children": [
{
"id": "e6531602d4349b2a",
"type": "leaf",
"state": {
"type": "empty",
"state": {},
"icon": "lucide-file",
"title": "New tab"
}
}
]
}
],
"direction": "vertical"
},
"left": {
"id": "276730462dc971b3",
"type": "mobile-drawer",
"children": [
{
"id": "c8562be98e157434",
"type": "leaf",
"state": {
"type": "file-explorer",
"state": {
"sortOrder": "alphabetical",
"autoReveal": false,
"showSearch": false,
"searchQuery": ""
},
"icon": "lucide-folder-closed",
"title": "Files"
}
},
{
"id": "88703b2790ca8315",
"type": "leaf",
"state": {
"type": "search",
"state": {
"query": "",
"matchingCase": false,
"explainSearch": false,
"collapseAll": false,
"extraContext": false,
"sortOrder": "alphabetical"
},
"icon": "lucide-search",
"title": "Search"
}
},
{
"id": "8355a621a5a27369",
"type": "leaf",
"state": {
"type": "tag",
"state": {
"sortOrder": "frequency",
"useHierarchy": true,
"showSearch": false,
"searchQuery": ""
},
"icon": "lucide-tags",
"title": "Tags"
}
},
{
"id": "29297bd119b10fe7",
"type": "leaf",
"state": {
"type": "all-properties",
"state": {
"sortOrder": "frequency",
"showSearch": false,
"searchQuery": ""
},
"icon": "lucide-archive",
"title": "All properties"
}
},
{
"id": "f3db60bed780c99a",
"type": "leaf",
"state": {
"type": "bookmarks",
"state": {
"showSearch": false,
"searchQuery": ""
},
"icon": "lucide-bookmark",
"title": "Bookmarks"
}
}
],
"currentTab": 0
},
"right": {
"id": "ed83865e6536707b",
"type": "mobile-drawer",
"children": [
{
"id": "c99a763b9cae7353",
"type": "leaf",
"state": {
"type": "backlink",
"state": {
"file": "2026-05-27 - Ստեփան Ռուսաստան Պիտակ.md",
"collapseAll": false,
"extraContext": false,
"sortOrder": "alphabetical",
"showSearch": false,
"searchQuery": "",
"backlinkCollapsed": false,
"unlinkedCollapsed": true
},
"icon": "links-coming-in",
"title": "Backlinks"
}
},
{
"id": "507735b21e974214",
"type": "leaf",
"state": {
"type": "outgoing-link",
"state": {
"file": "2026-05-27 - Ստեփան Ռուսաստան Պիտակ.md",
"linksCollapsed": false,
"unlinkedCollapsed": true
},
"icon": "links-going-out",
"title": "Outgoing links"
}
},
{
"id": "fd6f26ba228a89b4",
"type": "leaf",
"state": {
"type": "outline",
"state": {
"file": "2026-05-27 - Ստեփան Ռուսաստան Պիտակ.md",
"followCursor": false,
"showSearch": false,
"searchQuery": ""
},
"icon": "lucide-list",
"title": "Outline"
}
}
],
"currentTab": 0
},
"left-ribbon": {
"hiddenItems": {
"switcher:Open quick switcher": false,
"graph:Open graph view": false,
"canvas:Create new canvas": false,
"daily-notes:Open today's daily note": false,
"templates:Insert template": false,
"command-palette:Open command palette": false,
"bases:Create new base": false,
"obsidian-git:Open Git source control": false
}
},
"active": "e6531602d4349b2a",
"lastOpenFiles": [
"This is a new note for a test from I phone.md",
"Untitled.base",
"Untitled 1.base",
"Transfer from Belgium.md",
"2026-05-27 - Ստեփան Ռուսաստան Պիտակ.md",
"2026-06-05 - OMD call about the laptop.md"
]
}
.obsidian/workspace.json
Vendored
-190
View File
@@ -1,190 +0,0 @@
{
"main": {
"id": "2e47f96e78ad8672",
"type": "split",
"children": [
{
"id": "65a477829009711c",
"type": "tabs",
"children": [
{
"id": "6e999aaae55b06d4",
"type": "leaf",
"state": {
"type": "empty",
"state": {},
"icon": "lucide-file",
"title": "New tab"
}
}
]
}
],
"direction": "vertical"
},
"left": {
"id": "a9b97f1153943349",
"type": "split",
"children": [
{
"id": "6f4d1b67ca58ebd5",
"type": "tabs",
"children": [
{
"id": "8b1f73d5e9e1906e",
"type": "leaf",
"state": {
"type": "file-explorer",
"state": {
"sortOrder": "alphabetical",
"autoReveal": false,
"showSearch": false,
"searchQuery": ""
},
"icon": "lucide-folder-closed",
"title": "Files"
}
},
{
"id": "3e351327a4795509",
"type": "leaf",
"state": {
"type": "search",
"state": {
"query": "",
"matchingCase": false,
"explainSearch": false,
"collapseAll": false,
"extraContext": false,
"sortOrder": "alphabetical"
},
"icon": "lucide-search",
"title": "Search"
}
},
{
"id": "d0d63005e5345dc0",
"type": "leaf",
"state": {
"type": "bookmarks",
"state": {
"showSearch": false,
"searchQuery": ""
},
"icon": "lucide-bookmark",
"title": "Bookmarks"
}
}
]
}
],
"direction": "horizontal",
"width": 300
},
"right": {
"id": "e0388e7d9921b893",
"type": "split",
"children": [
{
"id": "a421dc79a37ccabb",
"type": "tabs",
"children": [
{
"id": "8d439bd70fd4490d",
"type": "leaf",
"state": {
"type": "backlink",
"state": {
"collapseAll": false,
"extraContext": false,
"sortOrder": "alphabetical",
"showSearch": false,
"searchQuery": "",
"backlinkCollapsed": false,
"unlinkedCollapsed": true
},
"icon": "links-coming-in",
"title": "Backlinks"
}
},
{
"id": "0d453c368e5f4723",
"type": "leaf",
"state": {
"type": "outgoing-link",
"state": {
"linksCollapsed": false,
"unlinkedCollapsed": true
},
"icon": "links-going-out",
"title": "Outgoing links"
}
},
{
"id": "5bee4ef9d6cd53e7",
"type": "leaf",
"state": {
"type": "tag",
"state": {
"sortOrder": "frequency",
"useHierarchy": true,
"showSearch": false,
"searchQuery": ""
},
"icon": "lucide-tags",
"title": "Tags"
}
},
{
"id": "43e17f8f8c33f815",
"type": "leaf",
"state": {
"type": "all-properties",
"state": {
"sortOrder": "frequency",
"showSearch": false,
"searchQuery": ""
},
"icon": "lucide-archive",
"title": "All properties"
}
},
{
"id": "4ee735694c63294b",
"type": "leaf",
"state": {
"type": "outline",
"state": {
"followCursor": false,
"showSearch": false,
"searchQuery": ""
},
"icon": "lucide-list",
"title": "Outline"
}
}
]
}
],
"direction": "horizontal",
"width": 300,
"collapsed": true
},
"left-ribbon": {
"hiddenItems": {
"switcher:Open quick switcher": false,
"graph:Open graph view": false,
"canvas:Create new canvas": false,
"daily-notes:Open today's daily note": false,
"templates:Insert template": false,
"command-palette:Open command palette": false,
"bases:Create new base": false,
"obsidian-git:Open Git source control": false
}
},
"active": "6e999aaae55b06d4",
"lastOpenFiles": [
"a new file.md",
"2026-08-11.md"
]
}
This is a new note for a test from I phone.md
+2
View File
@@ -0,0 +1,2 @@
Test
This is the new added line
Transfer from Belgium.md
View File
Untitled.base
+3
View File
@@ -0,0 +1,3 @@
views:
- type: table
name: Table