colin/Positronic_Brain
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed merge conlict in workspace.

Browse Source
This commit is contained in:
Colin Diem
2022-04-26 10:14:18 -04:00
parent dd702d0f3e
commit 6b15877e7a
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.obsidian/workspace vendored
View File

@@ -90,14 +90,14 @@
"active": "7e5435eb2f8fc620", "active": "7e5435eb2f8fc620",
"lastOpenFiles": [ "lastOpenFiles": [
"Gaming/TTRPGs/D&D/Cormanthor/Regional Context.md", "Gaming/TTRPGs/D&D/Cormanthor/Regional Context.md",
"People/Murph.md",
"People/Alison Diem.md", "People/Alison Diem.md",
"templates/Person.md", "Gaming/TTRPGs/D&D/AcqInc Team Y/Team Y.md",
"templates/D&D Recap.md", "People/Bonnie Wessler.md",
"Gaming/TTRPGs/D&D/Cormanthor/Background.md", "Gaming/TTRPGs/D&D/AcqInc Team Y/Zilara.md",
"Gaming/TTRPGs/D&D/AcqInc Team Y/Recap for 2022-04-17.md", "Gaming/TTRPGs/D&D/AcqInc Team Y/Urroul.md",
"Gaming/TTRPGs/D&D/Cormanthor/Rumors.md", "Gaming/TTRPGs/D&D/AcqInc Team Y/Butios Gikru.md",
"Programming/Random thoughts on programming.md", "Gaming/TTRPGs/D&D/AcqInc Team Y/Guy.md",
"Gaming/TTRPGs/D&D/AcqInc Team Y/Team Y.md" "Gaming/TTRPGs/D&D/AcqInc Team Y/Jorr.md",
"Gaming/TTRPGs/D&D/AcqInc Team Y/Recap for 2022-04-17.md"
] ]
} }