1
0
Fork 0

Pull Edikoyo-Main into Edikoyo-n04 #1

Merged
n04 merged 107 commits from Edikoyo/EdikoyoWiki:main into main 2024-09-07 23:41:19 +00:00
4 changed files with 35 additions and 32 deletions
Showing only changes of commit 15df901b77 - Show all commits

View file

@ -71,15 +71,28 @@
"id": "e18161b255f8c3cb", "id": "e18161b255f8c3cb",
"type": "leaf", "type": "leaf",
"state": { "state": {
"type": "diff-view", "type": "markdown",
"state": { "state": {
"file": "Edikoyo/.obsidian/workspace.json", "file": "Animals/Slimes/_index.md",
"staged": false "mode": "source",
"source": false
}
}
},
{
"id": "6e65a1802f52d161",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "test.md",
"mode": "source",
"source": false
} }
} }
} }
], ],
"currentTab": 5 "currentTab": 6
} }
], ],
"direction": "vertical" "direction": "vertical"
@ -145,6 +158,7 @@
"state": { "state": {
"type": "backlink", "type": "backlink",
"state": { "state": {
"file": "test.md",
"collapseAll": false, "collapseAll": false,
"extraContext": false, "extraContext": false,
"sortOrder": "alphabetical", "sortOrder": "alphabetical",
@ -161,6 +175,7 @@
"state": { "state": {
"type": "outgoing-link", "type": "outgoing-link",
"state": { "state": {
"file": "test.md",
"linksCollapsed": false, "linksCollapsed": false,
"unlinkedCollapsed": true "unlinkedCollapsed": true
} }
@ -182,7 +197,9 @@
"type": "leaf", "type": "leaf",
"state": { "state": {
"type": "outline", "type": "outline",
"state": {} "state": {
"file": "test.md"
}
} }
}, },
{ {
@ -210,12 +227,13 @@
"obsidian-git:Open Git source control": false "obsidian-git:Open Git source control": false
} }
}, },
"active": "e18161b255f8c3cb", "active": "6e65a1802f52d161",
"lastOpenFiles": [ "lastOpenFiles": [
"conflict-files-obsidian-git.md",
"Animals/Slimes/Ababa Slime.md",
"Animals/_index.md",
"Animals/Slimes/_index.md", "Animals/Slimes/_index.md",
"test.md",
"Animals/Slimes/Ababa Slime.md",
"conflict-files-obsidian-git.md",
"Animals/_index.md",
"Test One.md", "Test One.md",
"Animals/Slimes/Test.md", "Animals/Slimes/Test.md",
"Animals/Cat.md", "Animals/Cat.md",
@ -238,7 +256,6 @@
"Countries/Dolfeyja.md", "Countries/Dolfeyja.md",
"Countries/Dratana.md", "Countries/Dratana.md",
"Countries/Dahallow.md", "Countries/Dahallow.md",
"Countries/Calcetron.md",
"Languages", "Languages",
"Images/Flags/vosaka.png", "Images/Flags/vosaka.png",
"Images/Flags/vikogyna.png", "Images/Flags/vikogyna.png",

2
Edikoyo/test.md Normal file
View file

@ -0,0 +1,2 @@
```dataview
```

View file

@ -1,22 +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](conflict-files-obsidian-git.md#additional-instructions) available below file list
* Not a file: Edikoyo/.obsidian/workspace.json
# 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
````

6
content/test.md Normal file
View file

@ -0,0 +1,6 @@
---
---
````dataview
````