Compare commits
2 Commits
dcecfda4fc
...
29f7c07e4c
| Author | SHA1 | Date | |
|---|---|---|---|
| 29f7c07e4c | |||
| ffeccca723 |
259
.obsidian/workspace.json
vendored
259
.obsidian/workspace.json
vendored
@ -1,259 +0,0 @@
|
||||
{
|
||||
"main": {
|
||||
"id": "0e274d9edc8c2fe9",
|
||||
"type": "split",
|
||||
"children": [
|
||||
{
|
||||
"id": "90426974024a86f9",
|
||||
"type": "tabs",
|
||||
"children": [
|
||||
{
|
||||
"id": "fcc28e70ad8acbd2",
|
||||
"type": "leaf",
|
||||
"state": {
|
||||
"type": "markdown",
|
||||
"state": {
|
||||
"file": "Languages & Machines/Regular languages.md",
|
||||
"mode": "source",
|
||||
"source": false
|
||||
},
|
||||
"icon": "lucide-file",
|
||||
"title": "Regular languages"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"direction": "vertical"
|
||||
},
|
||||
"left": {
|
||||
"id": "14a8ed1946809664",
|
||||
"type": "split",
|
||||
"children": [
|
||||
{
|
||||
"id": "92972e07e7778c7e",
|
||||
"type": "tabs",
|
||||
"children": [
|
||||
{
|
||||
"id": "56bef0584922cba9",
|
||||
"type": "leaf",
|
||||
"state": {
|
||||
"type": "file-explorer",
|
||||
"state": {
|
||||
"sortOrder": "alphabetical",
|
||||
"autoReveal": false
|
||||
},
|
||||
"icon": "lucide-folder-closed",
|
||||
"title": "Files"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "919f0d89f8f5c3bb",
|
||||
"type": "leaf",
|
||||
"state": {
|
||||
"type": "search",
|
||||
"state": {
|
||||
"query": "",
|
||||
"matchingCase": false,
|
||||
"explainSearch": false,
|
||||
"collapseAll": false,
|
||||
"extraContext": false,
|
||||
"sortOrder": "alphabetical"
|
||||
},
|
||||
"icon": "lucide-search",
|
||||
"title": "Search"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "b590c125634ae7e4",
|
||||
"type": "leaf",
|
||||
"state": {
|
||||
"type": "bookmarks",
|
||||
"state": {},
|
||||
"icon": "lucide-bookmark",
|
||||
"title": "Bookmarks"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"direction": "horizontal",
|
||||
"width": 234.5
|
||||
},
|
||||
"right": {
|
||||
"id": "fd4347e6b5300816",
|
||||
"type": "split",
|
||||
"children": [
|
||||
{
|
||||
"id": "5d827a80e07e299e",
|
||||
"type": "tabs",
|
||||
"children": [
|
||||
{
|
||||
"id": "10adbcc903d0c352",
|
||||
"type": "leaf",
|
||||
"state": {
|
||||
"type": "backlink",
|
||||
"state": {
|
||||
"file": "Extracurricular/Circuitree/Committee Market/discussion/Macro pad.md",
|
||||
"collapseAll": false,
|
||||
"extraContext": false,
|
||||
"sortOrder": "alphabetical",
|
||||
"showSearch": false,
|
||||
"searchQuery": "",
|
||||
"backlinkCollapsed": false,
|
||||
"unlinkedCollapsed": true
|
||||
},
|
||||
"icon": "links-coming-in",
|
||||
"title": "Backlinks for Macro pad"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "d61fc22784bbd3b0",
|
||||
"type": "leaf",
|
||||
"state": {
|
||||
"type": "outgoing-link",
|
||||
"state": {
|
||||
"file": "Extracurricular/Circuitree/Committee Market/discussion/Macro pad.md",
|
||||
"linksCollapsed": false,
|
||||
"unlinkedCollapsed": true
|
||||
},
|
||||
"icon": "links-going-out",
|
||||
"title": "Outgoing links from Macro pad"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "c6317bbbe070400b",
|
||||
"type": "leaf",
|
||||
"state": {
|
||||
"type": "tag",
|
||||
"state": {
|
||||
"sortOrder": "frequency",
|
||||
"useHierarchy": true
|
||||
},
|
||||
"icon": "lucide-tags",
|
||||
"title": "Tags"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "9fea917e949ad714",
|
||||
"type": "leaf",
|
||||
"state": {
|
||||
"type": "outline",
|
||||
"state": {
|
||||
"file": "Extracurricular/Circuitree/Committee Market/discussion/Macro pad.md"
|
||||
},
|
||||
"icon": "lucide-list",
|
||||
"title": "Outline of Macro pad"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "e195b03d8630d307",
|
||||
"type": "leaf",
|
||||
"state": {
|
||||
"type": "QUICKSHARE_SIDE_VIEW",
|
||||
"state": {},
|
||||
"icon": "lucide-file",
|
||||
"title": "Plugin no longer active"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "ac10c8e987c0e736",
|
||||
"type": "leaf",
|
||||
"state": {
|
||||
"type": "git-view",
|
||||
"state": {},
|
||||
"icon": "git-pull-request",
|
||||
"title": "Source Control"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "9a5124aa0b3cede4",
|
||||
"type": "leaf",
|
||||
"state": {
|
||||
"type": "transcript-view",
|
||||
"state": {},
|
||||
"icon": "lucide-file",
|
||||
"title": "Plugin no longer active"
|
||||
}
|
||||
}
|
||||
],
|
||||
"currentTab": 5
|
||||
}
|
||||
],
|
||||
"direction": "horizontal",
|
||||
"width": 200,
|
||||
"collapsed": true
|
||||
},
|
||||
"left-ribbon": {
|
||||
"hiddenItems": {
|
||||
"switcher:Open quick switcher": false,
|
||||
"graph:Open graph view": false,
|
||||
"canvas:Create new canvas": false,
|
||||
"daily-notes:Open today's daily note": false,
|
||||
"templates:Insert template": false,
|
||||
"command-palette:Open command palette": false,
|
||||
"obsidian-excalidraw-plugin:Create new drawing": false,
|
||||
"table-editor-obsidian:Advanced Tables Toolbar": false,
|
||||
"obsidian-git:Open Git source control": false,
|
||||
"obsidian-advanced-slides:Show Slide Preview": false,
|
||||
"omnisearch:Omnisearch": false
|
||||
}
|
||||
},
|
||||
"active": "fcc28e70ad8acbd2",
|
||||
"lastOpenFiles": [
|
||||
"Discrete Structures/Mathematical Proofs (Induction).md",
|
||||
"Discrete Structures/Recurrence relations.md",
|
||||
"Discrete Structures/Relations and Digraphs.md",
|
||||
"Discrete Structures/Mathematical Data Structures.md",
|
||||
"Discrete Structures/Counting.md",
|
||||
"Languages & Machines/Regular languages.md",
|
||||
"Software Engineering/Meeting.md",
|
||||
"Software Engineering/Reqirements.md",
|
||||
"Introduction to Machine Learning/Introductory lecture.md",
|
||||
"Languages & Machines/Introduction.md",
|
||||
"Functional Programming/Proofs.md",
|
||||
"Functional Programming/Recursion.md",
|
||||
"Functional Programming/Lists.md",
|
||||
"Functional Programming/Eq and Num.md",
|
||||
"Functional Programming/Introduction to Functional Programming.md",
|
||||
"Functional Programming/Basic Haskell.md",
|
||||
"Languages & Machines/assets/Pasted image 20250113151159.png",
|
||||
"Languages & Machines/assets/Pasted image 20250414190100.png",
|
||||
"Languages & Machines/assets",
|
||||
"Languages & Machines/assets/Pasted image 20250414190229.png",
|
||||
"Languages & Machines/assets/Pasted image 20250414190144.png",
|
||||
"Languages & Machines/assets/Pasted image 20250414190119.png",
|
||||
"Operating Systems/Introductory lecture.md",
|
||||
"Languages & Machines",
|
||||
"Introduction to Machine Learning/image.png",
|
||||
"Software Engineering/Initial Questions.md",
|
||||
"Software Engineering/TA Meeting 1.md",
|
||||
"Extracurricular/Misc/Plan.md",
|
||||
"Extracurricular/Misc/Proposed Routine Plan.canvas",
|
||||
"Extracurricular/Misc/Ideas.md",
|
||||
"Extracurricular/Circuitree/Antenna Building/Idea and proposed timeline.md",
|
||||
"Extracurricular/Circuitree/Antenna Building/Untitled",
|
||||
"Extracurricular/Circuitree/Antenna Building",
|
||||
"Software Engineering",
|
||||
"Operating Systems/assets/image.png",
|
||||
"Operating Systems/assets/Pasted image 20250204103541.png",
|
||||
"Operating Systems/assets",
|
||||
"Operating Systems",
|
||||
"Introduction to Machine Learning/assets/image.png",
|
||||
"Introduction to Machine Learning/assets",
|
||||
"Introduction to Machine Learning",
|
||||
"Fundamentals of Electronics/Introductory Lecture.md",
|
||||
"Fundamentals of Electronics",
|
||||
"Extracurricular/Circuitree/Committee Market/Macro pad.md",
|
||||
"Functional Programming/Polymorphism.md",
|
||||
"Discrete Structures/Midterm/Midterm prep.md",
|
||||
"Functional Programming/assets/Pasted image 20241125164049.png",
|
||||
"Untitled.canvas",
|
||||
"Web Engineering/canvae/server_client.canvas",
|
||||
"Advanced Programming/projects/second/Refactoring.canvas",
|
||||
"Advanced Programming/assets/assignment/assignment_organization.canvas",
|
||||
"Advanced Programming/assets/spring/Beans.canvas",
|
||||
"Advanced Programming/assets/assignment/assignment_app.canvas",
|
||||
"Extracurricular/Circuitree/Committee Market/discussion/Proposed showcase infra.canvas"
|
||||
]
|
||||
}
|
||||
17
conflict-files-obsidian-git.md
Normal file
17
conflict-files-obsidian-git.md
Normal file
@ -0,0 +1,17 @@
|
||||
# Conflicts
|
||||
Please resolve them and commit them using the commands `Git: Commit all changes` followed by `Git: Push`
|
||||
(This file will automatically be deleted before commit)
|
||||
[[#Additional Instructions]] available below file list
|
||||
|
||||
- Not a file: .obsidian/workspace.json
|
||||
|
||||
# Additional Instructions
|
||||
I strongly recommend to use "Source mode" for viewing the conflicted files. For simple conflicts, in each file listed above replace every occurrence of the following text blocks with the desired text.
|
||||
|
||||
```diff
|
||||
<<<<<<< HEAD
|
||||
File changes in local repository
|
||||
=======
|
||||
File changes in remote repository
|
||||
>>>>>>> origin/main
|
||||
```
|
||||
Loading…
x
Reference in New Issue
Block a user