Skip to content

Commit 9a0b4fd

Browse files
authored
Merge pull request #8 from AdyGCode/dev
other: Obsidian workspace update
2 parents 25b3d0f + ebb909f commit 9a0b4fd

File tree

1 file changed

+0
-76
lines changed

1 file changed

+0
-76
lines changed

.obsidian/workspace.json

Lines changed: 0 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,12 @@
1111
"id": "ffb884bc76ff47e7",
1212
"type": "leaf",
1313
"state": {
14-
<<<<<<< Updated upstream
15-
"type": "empty",
16-
"state": {}
17-
=======
1814
"type": "markdown",
1915
"state": {
2016
"file": "CONTRIBUTE.md",
2117
"mode": "source",
2218
"source": false
2319
}
24-
>>>>>>> Stashed changes
2520
}
2621
}
2722
]
@@ -90,10 +85,7 @@
9085
"state": {
9186
"type": "backlink",
9287
"state": {
93-
<<<<<<< Updated upstream
94-
=======
9588
"file": "CONTRIBUTE.md",
96-
>>>>>>> Stashed changes
9789
"collapseAll": false,
9890
"extraContext": false,
9991
"sortOrder": "alphabetical",
@@ -110,10 +102,7 @@
110102
"state": {
111103
"type": "outgoing-link",
112104
"state": {
113-
<<<<<<< Updated upstream
114-
=======
115105
"file": "CONTRIBUTE.md",
116-
>>>>>>> Stashed changes
117106
"linksCollapsed": false,
118107
"unlinkedCollapsed": true
119108
}
@@ -135,13 +124,9 @@
135124
"type": "leaf",
136125
"state": {
137126
"type": "outline",
138-
<<<<<<< Updated upstream
139-
"state": {}
140-
=======
141127
"state": {
142128
"file": "CONTRIBUTE.md"
143129
}
144-
>>>>>>> Stashed changes
145130
}
146131
}
147132
]
@@ -164,66 +149,5 @@
164149
},
165150
"active": "ffb884bc76ff47e7",
166151
"lastOpenFiles": [
167-
<<<<<<< Updated upstream
168-
"docs/00-Back.md.md",
169-
"assets/back-cover.svg",
170-
"docs/00-Front.md.md",
171-
"assets/front-cover.svg",
172-
"docs/14-forking-over-code.md",
173-
"docs/15-workflows.md",
174-
=======
175-
"output",
176-
"LICENSE.md",
177-
"docs/14-forking-over-code.md",
178-
"docs/15-workflows.md",
179-
"docs/00-Back.md.md",
180-
"docs/00-Front.md.md",
181-
"assets/back-cover.svg",
182-
"assets/front-cover.svg",
183-
>>>>>>> Stashed changes
184-
"assets/pasted-image-20240216114456.png",
185-
"assets/pasted-image-20240216124422.png",
186-
"docs/98-command-line-extras.md",
187-
"assets/pasted-image-20240314105028.png",
188-
"assets/pasted-image-20240314102512.png",
189-
"docs/99-references-and-resources.md",
190-
"docs/08-status-add-commit.md",
191-
"docs/06-read-me.md",
192-
"ReadMe.md",
193-
"assets/BLANK_README.md",
194-
<<<<<<< Updated upstream
195-
"LICENSE.md",
196-
"CHANGELOG.md",
197-
"theme/style.css",
198-
"theme",
199-
"output",
200-
=======
201-
"CHANGELOG.md",
202-
"theme/style.css",
203-
"theme",
204-
>>>>>>> Stashed changes
205-
"docs/13-why-hello-dolly.md",
206-
"docs/12-remotely-useful.md",
207-
"docs/11-merging-and-conflicts.md",
208-
"docs/10-shaking-the-tree.md",
209-
"docs/09-git-history.md",
210-
"docs/07-ignore-me.md",
211-
"docs/05-global-settings.md",
212-
"docs/04-git-started.md",
213-
"docs/02-getting-ready.md",
214-
"docs/03-repositories-and-folders.md",
215-
"docs/01-what-is-version-control.md",
216-
"docs",
217-
"assets/brave_dWSQwZYc3F.mp4",
218-
"assets/2024-03-01_15_03_52-AdyGCode_git-remote-demo-ii-Brave.png",
219-
"assets/2024-03-01_14_57_49-New-repository-Brave.png",
220-
"assets/2024-03-01_14_57_43-New-repository-Brave.png",
221-
"assets/2024-03-01_14_57_37-New-repository-Brave.png",
222-
"CONTRIBUTE.md",
223-
"99-references-and-resources.md",
224-
"themes",
225-
"ReadMe.md~",
226-
"02-getting-ready.md~",
227-
"assets"
228152
]
229153
}

0 commit comments

Comments
 (0)