Pull Edikoyo-Main into Edikoyo-n04 #1
15
Edikoyo/.obsidian/workspace.json
vendored
|
|
@ -97,7 +97,7 @@
|
||||||
"state": {
|
"state": {
|
||||||
"type": "image",
|
"type": "image",
|
||||||
"state": {
|
"state": {
|
||||||
"file": "Images/ababa/ababa-3.png"
|
"file": "Images/Slimes/ababa/ababa-3.png"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
@ -249,13 +249,14 @@
|
||||||
"obsidian-git:Open Git source control": false
|
"obsidian-git:Open Git source control": false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"active": "950e4982a8d56b3d",
|
"active": "fdbd8ce5e8a10389",
|
||||||
"lastOpenFiles": [
|
"lastOpenFiles": [
|
||||||
"Images/ababa/ababa-3.png",
|
"Images/Slimes",
|
||||||
|
"Images/Slimes/ababa/ababa-3.png",
|
||||||
"conflict-files-obsidian-git.md",
|
"conflict-files-obsidian-git.md",
|
||||||
"Images/ababa/ababa-2.png",
|
"Images/Slimes/ababa/ababa-2.png",
|
||||||
"Images/ababa/ababa-1.png",
|
"Images/Slimes/ababa/ababa-1.png",
|
||||||
"Images/ababa/ababa-4.png",
|
"Images/Slimes/ababa/ababa-4.png",
|
||||||
"Languages/Mokrixi.md",
|
"Languages/Mokrixi.md",
|
||||||
"Languages/Lacelian.md",
|
"Languages/Lacelian.md",
|
||||||
"Languages/Guo.md",
|
"Languages/Guo.md",
|
||||||
|
|
@ -280,7 +281,7 @@
|
||||||
"Countries/Ovanos.md",
|
"Countries/Ovanos.md",
|
||||||
"Countries/Mortham.md",
|
"Countries/Mortham.md",
|
||||||
"Countries/Mantine.md",
|
"Countries/Mantine.md",
|
||||||
"Images/ababa",
|
"Images/Slimes/ababa",
|
||||||
"Images/slimes",
|
"Images/slimes",
|
||||||
"Countries/Faelani",
|
"Countries/Faelani",
|
||||||
"Images/Flags/barrowmaw.png",
|
"Images/Flags/barrowmaw.png",
|
||||||
|
|
|
||||||
|
After Width: | Height: | Size: 6.6 KiB |
|
After Width: | Height: | Size: 6.6 KiB |
|
After Width: | Height: | Size: 6.6 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
|Slimes|Variant 1|Variant 2|Variant 3|Golden Variant|Country Variant 1|Country Variant 2|Country Variant 3|
|
|Slimes|Variant 1|Variant 2|Variant 3|Golden Variant|Country Variant 1|Country Variant 2|Country Variant 3|
|
||||||
|------|---------|---------|---------|--------------|-----------------|-----------------|-----------------|
|
|------|---------|---------|---------|--------------|-----------------|-----------------|-----------------|
|
||||||
|[Ababa Slime](Ababa%20Slime.md)|||||[Batanoka](..\..\Countries\Batanoka.md)|[Faelani](..\..\Countries\Faelani.md)|[Barrowmaw](..\..\Countries\Barrowmaw.md)|
|
|[Ababa Slime](Ababa%20Slime.md)|||||[Batanoka](..\..\Countries\Batanoka.md)|[Faelani](..\..\Countries\Faelani.md)|[Barrowmaw](..\..\Countries\Barrowmaw.md)|
|
||||||
|[Untitled](Untitled.md)|-|-|-|-|-|-|-|
|
|[Untitled](Untitled.md)|-|-|-|-|-|-|-|
|
||||||
|
|
||||||
<!-- SerializedQuery END -->
|
<!-- SerializedQuery END -->
|
||||||
|
|
|
||||||
|
After Width: | Height: | Size: 6.6 KiB |
|
After Width: | Height: | Size: 6.6 KiB |
|
After Width: | Height: | Size: 6.6 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
|
@ -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
|
|
||||||
````
|
|
||||||