.obsidian/workspace.json

@@ -187,11 +187,8 @@
   },
   "active": "7f5335dedff3052d",
   "lastOpenFiles": [
-<<<<<<< HEAD
-=======
     "old_notes/30 - Resources/Tech/Useful Commands.md",
     "inbox.md",
->>>>>>> 30e0573572bf2f74c80ecef3c74c96121630fd69
     "daily/2026-04-10.md",
     "daily/2026-04-23.md~",
     "daily/2026-04-23.md",

inbox.md

@@ -1,15 +1,9 @@
 <<<<<<< HEAD
-CSC Study Things:
-Repo & Reverse Repo
-
-=======
-<<<<<<< HEAD
 STOAT: mobile/desktop apps, music bots, gifs
 make sure AWS doesn't charge
 wiki and blog
 Sergei's PDF & Discord networking challenge
 =======
->>>>>>> 30e0573572bf2f74c80ecef3c74c96121630fd69
 maybe add work experience to resume
 maybe change resume to be for tech support
 Discord networking challenge