From 6b15877e7a2fb994c76980395e2f0a7378ab381a Mon Sep 17 00:00:00 2001 From: Colin Diem Date: Tue, 26 Apr 2022 10:14:18 -0400 Subject: [PATCH] Fixed merge conlict in workspace. --- .obsidian/workspace | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.obsidian/workspace b/.obsidian/workspace index bdbd278..57d5bbd 100644 --- a/.obsidian/workspace +++ b/.obsidian/workspace @@ -90,14 +90,14 @@ "active": "7e5435eb2f8fc620", "lastOpenFiles": [ "Gaming/TTRPGs/D&D/Cormanthor/Regional Context.md", - "People/Murph.md", "People/Alison Diem.md", - "templates/Person.md", - "templates/D&D Recap.md", - "Gaming/TTRPGs/D&D/Cormanthor/Background.md", - "Gaming/TTRPGs/D&D/AcqInc Team Y/Recap for 2022-04-17.md", - "Gaming/TTRPGs/D&D/Cormanthor/Rumors.md", - "Programming/Random thoughts on programming.md", - "Gaming/TTRPGs/D&D/AcqInc Team Y/Team Y.md" + "Gaming/TTRPGs/D&D/AcqInc Team Y/Team Y.md", + "People/Bonnie Wessler.md", + "Gaming/TTRPGs/D&D/AcqInc Team Y/Zilara.md", + "Gaming/TTRPGs/D&D/AcqInc Team Y/Urroul.md", + "Gaming/TTRPGs/D&D/AcqInc Team Y/Butios Gikru.md", + "Gaming/TTRPGs/D&D/AcqInc Team Y/Guy.md", + "Gaming/TTRPGs/D&D/AcqInc Team Y/Jorr.md", + "Gaming/TTRPGs/D&D/AcqInc Team Y/Recap for 2022-04-17.md" ] } \ No newline at end of file