Merge pull request #8 from AdyGCode/dev

other: Obsidian workspace update
AdyGCode · Mar 14, 2024 · 9a0b4fd · 9a0b4fd
2 parents 25b3d0f + ebb909f
commit 9a0b4fd
Showing 1 changed file with 0 additions and 76 deletions.
diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
@@ -11,17 +11,12 @@
             "id": "ffb884bc76ff47e7",
             "type": "leaf",
             "state": {
-<<<<<<< Updated upstream
-              "type": "empty",
-              "state": {}
-=======
               "type": "markdown",
               "state": {
                 "file": "CONTRIBUTE.md",
                 "mode": "source",
                 "source": false
               }
->>>>>>> Stashed changes
             }
           }
         ]
@@ -90,10 +85,7 @@
             "state": {
               "type": "backlink",
               "state": {
-<<<<<<< Updated upstream
-=======
                 "file": "CONTRIBUTE.md",
->>>>>>> Stashed changes
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -110,10 +102,7 @@
             "state": {
               "type": "outgoing-link",
               "state": {
-<<<<<<< Updated upstream
-=======
                 "file": "CONTRIBUTE.md",
->>>>>>> Stashed changes
                 "linksCollapsed": false,
                 "unlinkedCollapsed": true
               }
@@ -135,13 +124,9 @@
             "type": "leaf",
             "state": {
               "type": "outline",
-<<<<<<< Updated upstream
-              "state": {}
-=======
               "state": {
                 "file": "CONTRIBUTE.md"
               }
->>>>>>> Stashed changes
             }
           }
         ]
@@ -164,66 +149,5 @@
   },
   "active": "ffb884bc76ff47e7",
   "lastOpenFiles": [
-<<<<<<< Updated upstream
-    "docs/00-Back.md.md",
-    "assets/back-cover.svg",
-    "docs/00-Front.md.md",
-    "assets/front-cover.svg",
-    "docs/14-forking-over-code.md",
-    "docs/15-workflows.md",
-=======
-    "output",
-    "LICENSE.md",
-    "docs/14-forking-over-code.md",
-    "docs/15-workflows.md",
-    "docs/00-Back.md.md",
-    "docs/00-Front.md.md",
-    "assets/back-cover.svg",
-    "assets/front-cover.svg",
->>>>>>> Stashed changes
-    "assets/pasted-image-20240216114456.png",
-    "assets/pasted-image-20240216124422.png",
-    "docs/98-command-line-extras.md",
-    "assets/pasted-image-20240314105028.png",
-    "assets/pasted-image-20240314102512.png",
-    "docs/99-references-and-resources.md",
-    "docs/08-status-add-commit.md",
-    "docs/06-read-me.md",
-    "ReadMe.md",
-    "assets/BLANK_README.md",
-<<<<<<< Updated upstream
-    "LICENSE.md",
-    "CHANGELOG.md",
-    "theme/style.css",
-    "theme",
-    "output",
-=======
-    "CHANGELOG.md",
-    "theme/style.css",
-    "theme",
->>>>>>> Stashed changes
-    "docs/13-why-hello-dolly.md",
-    "docs/12-remotely-useful.md",
-    "docs/11-merging-and-conflicts.md",
-    "docs/10-shaking-the-tree.md",
-    "docs/09-git-history.md",
-    "docs/07-ignore-me.md",
-    "docs/05-global-settings.md",
-    "docs/04-git-started.md",
-    "docs/02-getting-ready.md",
-    "docs/03-repositories-and-folders.md",
-    "docs/01-what-is-version-control.md",
-    "docs",
-    "assets/brave_dWSQwZYc3F.mp4",
-    "assets/2024-03-01_15_03_52-AdyGCode_git-remote-demo-ii-Brave.png",
-    "assets/2024-03-01_14_57_49-New-repository-Brave.png",
-    "assets/2024-03-01_14_57_43-New-repository-Brave.png",
-    "assets/2024-03-01_14_57_37-New-repository-Brave.png",
-    "CONTRIBUTE.md",
-    "99-references-and-resources.md",
-    "themes",
-    "ReadMe.md~",
-    "02-getting-ready.md~",
-    "assets"
   ]
 }