vault backup: 2024-09-03 08:51:51
This commit is contained in:
parent
c33bf0e368
commit
7853ec9caa
144
.obsidian/workspace.json
vendored
144
.obsidian/workspace.json
vendored
@ -4,11 +4,23 @@
|
|||||||
"type": "split",
|
"type": "split",
|
||||||
"children": [
|
"children": [
|
||||||
{
|
{
|
||||||
"id": "abdb27afca1dcb06",
|
"id": "f2710f80feb0fcd8",
|
||||||
"type": "tabs",
|
"type": "tabs",
|
||||||
"children": [
|
"children": [
|
||||||
{
|
{
|
||||||
"id": "b5b85c36ff87e102",
|
"id": "f2f0bf554b1c0989",
|
||||||
|
"type": "leaf",
|
||||||
|
"state": {
|
||||||
|
"type": "markdown",
|
||||||
|
"state": {
|
||||||
|
"file": "300s School/302. NUCE 2100 - Fundamentals of Nuclear Engineering/2024-08-27 Introduction.md",
|
||||||
|
"mode": "source",
|
||||||
|
"source": false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "ec3d5104c03dc083",
|
||||||
"type": "leaf",
|
"type": "leaf",
|
||||||
"state": {
|
"state": {
|
||||||
"type": "full-calendar-view",
|
"type": "full-calendar-view",
|
||||||
@ -16,31 +28,43 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "3c8fa3261c26a8f5",
|
"id": "a513688fb659482a",
|
||||||
"type": "leaf",
|
"type": "leaf",
|
||||||
"state": {
|
"state": {
|
||||||
"type": "markdown",
|
"type": "markdown",
|
||||||
"state": {
|
"state": {
|
||||||
"file": "QE Abstract For Dan.md",
|
"file": "3-99 Research/6. Researching Techniques/Learning How to Use Github.md",
|
||||||
"mode": "source",
|
"mode": "source",
|
||||||
"source": false
|
"source": false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "d9b2c54ab23d25b7",
|
"id": "7220717c2848cdda",
|
||||||
"type": "leaf",
|
"type": "leaf",
|
||||||
"state": {
|
"state": {
|
||||||
"type": "markdown",
|
"type": "markdown",
|
||||||
"state": {
|
"state": {
|
||||||
"file": "1. Daily Notes/8. August/2024-08-30.md",
|
"file": "3-99 Research/6. Researching Techniques/Learning How to Use Github.md",
|
||||||
|
"mode": "source",
|
||||||
|
"source": false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "284ed68e24b35154",
|
||||||
|
"type": "leaf",
|
||||||
|
"state": {
|
||||||
|
"type": "markdown",
|
||||||
|
"state": {
|
||||||
|
"file": "3-99 Research/6. Researching Techniques/Learning How to Use Github.md",
|
||||||
"mode": "source",
|
"mode": "source",
|
||||||
"source": false
|
"source": false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"currentTab": 1
|
"currentTab": 4
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"direction": "vertical"
|
"direction": "vertical"
|
||||||
@ -90,7 +114,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"direction": "horizontal",
|
"direction": "horizontal",
|
||||||
"width": 467.5
|
"width": 258.5
|
||||||
},
|
},
|
||||||
"right": {
|
"right": {
|
||||||
"id": "2f2905a6a7d5f153",
|
"id": "2f2905a6a7d5f153",
|
||||||
@ -99,7 +123,6 @@
|
|||||||
{
|
{
|
||||||
"id": "25061316272623b8",
|
"id": "25061316272623b8",
|
||||||
"type": "tabs",
|
"type": "tabs",
|
||||||
"dimension": 41.12215909090909,
|
|
||||||
"children": [
|
"children": [
|
||||||
{
|
{
|
||||||
"id": "65dbd435d8f1a76f",
|
"id": "65dbd435d8f1a76f",
|
||||||
@ -107,7 +130,7 @@
|
|||||||
"state": {
|
"state": {
|
||||||
"type": "backlink",
|
"type": "backlink",
|
||||||
"state": {
|
"state": {
|
||||||
"file": "QE Abstract For Dan.md",
|
"file": "3-99 Research/6. Researching Techniques/Learning How to Use Github.md",
|
||||||
"collapseAll": true,
|
"collapseAll": true,
|
||||||
"extraContext": false,
|
"extraContext": false,
|
||||||
"sortOrder": "alphabetical",
|
"sortOrder": "alphabetical",
|
||||||
@ -124,7 +147,7 @@
|
|||||||
"state": {
|
"state": {
|
||||||
"type": "outgoing-link",
|
"type": "outgoing-link",
|
||||||
"state": {
|
"state": {
|
||||||
"file": "QE Abstract For Dan.md",
|
"file": "3-99 Research/6. Researching Techniques/Learning How to Use Github.md",
|
||||||
"linksCollapsed": false,
|
"linksCollapsed": false,
|
||||||
"unlinkedCollapsed": true
|
"unlinkedCollapsed": true
|
||||||
}
|
}
|
||||||
@ -147,47 +170,17 @@
|
|||||||
"state": {
|
"state": {
|
||||||
"type": "outline",
|
"type": "outline",
|
||||||
"state": {
|
"state": {
|
||||||
"file": "QE Abstract For Dan.md"
|
"file": "3-99 Research/6. Researching Techniques/Learning How to Use Github.md"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"currentTab": 3
|
"currentTab": 3
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "509b9d2a8b3ad51d",
|
|
||||||
"type": "tabs",
|
|
||||||
"dimension": 58.87784090909091,
|
|
||||||
"children": [
|
|
||||||
{
|
|
||||||
"id": "a7f5a9ce2764a9ae",
|
|
||||||
"type": "leaf",
|
|
||||||
"state": {
|
|
||||||
"type": "markdown",
|
|
||||||
"state": {
|
|
||||||
"file": "3-99 Research/6. Researching Techniques/Highlighting Colors and What they Mean.md",
|
|
||||||
"mode": "source",
|
|
||||||
"source": false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "a59e1db820ae8162",
|
|
||||||
"type": "leaf",
|
|
||||||
"state": {
|
|
||||||
"type": "markdown",
|
|
||||||
"state": {
|
|
||||||
"file": "3-99 Research/6. Researching Techniques/Useful VIM commands.md",
|
|
||||||
"mode": "source",
|
|
||||||
"source": false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"direction": "horizontal",
|
"direction": "horizontal",
|
||||||
"width": 343.5
|
"width": 200,
|
||||||
|
"collapsed": true
|
||||||
},
|
},
|
||||||
"left-ribbon": {
|
"left-ribbon": {
|
||||||
"hiddenItems": {
|
"hiddenItems": {
|
||||||
@ -201,49 +194,46 @@
|
|||||||
"obsidian-full-calendar:Open Full Calendar": false
|
"obsidian-full-calendar:Open Full Calendar": false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"active": "3c8fa3261c26a8f5",
|
"active": "284ed68e24b35154",
|
||||||
"lastOpenFiles": [
|
"lastOpenFiles": [
|
||||||
|
"giter_done.sh~",
|
||||||
|
"giter_done.sh",
|
||||||
|
"conflict-files-obsidian-git.md",
|
||||||
|
"3-99 Research/6. Researching Techniques/Learning How to Use Github.md",
|
||||||
|
"300s School/302. NUCE 2100 - Fundamentals of Nuclear Engineering/2024-08-27 Introduction.md",
|
||||||
|
"QE Abstract For Dan.md",
|
||||||
"4. Qualifying Exam/QE Abstract For Dan.pdf",
|
"4. Qualifying Exam/QE Abstract For Dan.pdf",
|
||||||
"4. Qualifying Exam/2. Writing/QE Abstract.md",
|
"4. Qualifying Exam/2. Writing/QE Abstract.md",
|
||||||
"QE Abstract For Dan.md",
|
|
||||||
"3-99 Research/6. Researching Techniques/Highlighting Colors and What they Mean.md",
|
|
||||||
"1. Daily Notes/8. August/2024-08-30.md",
|
|
||||||
"conflict-files-obsidian-git.md",
|
|
||||||
"Weekly Note 2024-09-04.md",
|
|
||||||
"2024-08-30.md",
|
|
||||||
"2. Cole Group Meeting Notes/Weekly Note 2024-08-30.md",
|
"2. Cole Group Meeting Notes/Weekly Note 2024-08-30.md",
|
||||||
"3-99 Research/6. Researching Techniques/Useful VIM commands.md",
|
|
||||||
"4. Qualifying Exam/1. Managing Stuff/QE Tasks and Details.md",
|
|
||||||
"QE Abstract Take 1 Edits.md",
|
|
||||||
"1. Daily Notes/8. August/2024-08-29.md",
|
|
||||||
"300s School/302. NUCE 2100 - Fundamentals of Nuclear Engineering/2024-09-03 Homework 1.md",
|
|
||||||
"2. Cole Group Meeting Notes/Weekly Note 2024-08-21.md",
|
|
||||||
"2. Cole Group Meeting Notes/Weekly Note 2024-08-28.md",
|
|
||||||
"1. Daily Notes/8. August/2024-08-28.md",
|
"1. Daily Notes/8. August/2024-08-28.md",
|
||||||
"1. Daily Notes/8. August/2024-08-27.md",
|
"1. Daily Notes/8. August/2024-08-27.md",
|
||||||
"1000s Templates/Daily Note Template.md",
|
"1. Daily Notes/8. August/2024-08-26.md",
|
||||||
|
"2. Cole Group Meeting Notes/Weekly Note 2024-08-21.md",
|
||||||
|
"1. Daily Notes/8. August/2024-08-23.md",
|
||||||
|
"Zotero Web Sever.md",
|
||||||
|
"3-99 Research/7. BeagleBone/2. pymodbus On the BeagleBone.md",
|
||||||
|
"1. Daily Notes/8. August/2024-08-22.md",
|
||||||
"1. Daily Notes/8. August/2024-08-21.md",
|
"1. Daily Notes/8. August/2024-08-21.md",
|
||||||
"1. Daily Notes/8. August/2024-08-12.md",
|
"Weekly Note 2024-09-04.md",
|
||||||
"1. Daily Notes/8. August/2024-08-08.md",
|
"1. Daily Notes/8. August/2024-08-29.md",
|
||||||
"1000s Templates/This Past Week Template.md",
|
"2024-08-30.md",
|
||||||
"900s Calendars/1. Other Work/2024-08-30 test1.md",
|
"2. Cole Group Meeting Notes/Weekly Note 2024-08-14.md",
|
||||||
"900s Calendars/1. Other Work/2024-08-29 test1.md",
|
"1. Daily Notes/8. August/2024-08-20.md",
|
||||||
"302. NUCE 2100 - Fundamentals of Nuclear Engineering/2024-08-27 Introduction.md",
|
"1. Daily Notes/8. August/2024-08-19.md",
|
||||||
"900s Calendars/3. Events",
|
"1. Daily Notes/8. August/2024-08-16.md",
|
||||||
"900s Calendars/2. Research",
|
"1. Daily Notes/8. August/2024-08-15.md",
|
||||||
"900s Calendars/1. Other Work",
|
"1. Daily Notes/8. August/2024-08-14.md",
|
||||||
"900s Calendars/0. Deadlines",
|
"1. Daily Notes/8. August/2024-08-07.md",
|
||||||
"900s Calendars",
|
"3-99 Research",
|
||||||
"4. Qualifying Exam/qualifying_exam_application_form.docx",
|
"300s School",
|
||||||
"4. Qualifying Exam/ME_PhD_Qualifying_Exam_Guideline_Fall2024.pdf",
|
|
||||||
"4. Qualifying Exam/2. Writing",
|
"4. Qualifying Exam/2. Writing",
|
||||||
|
"4. Qualifying Exam/ME_PhD_Qualifying_Exam_Guideline_Fall2024.pdf",
|
||||||
"4. Qualifying Exam/1. Managing Stuff",
|
"4. Qualifying Exam/1. Managing Stuff",
|
||||||
"4. Qualifying Exam",
|
"4. Qualifying Exam/qualifying_exam_application_form.docx",
|
||||||
|
"900s Calendars/0. Deadlines",
|
||||||
|
"300s School/299. ME 2085 - Graduate Seminar",
|
||||||
"300s School/302. NUCE 2100 - Fundamentals of Nuclear Engineering/Pasted image 20240827195025.png",
|
"300s School/302. NUCE 2100 - Fundamentals of Nuclear Engineering/Pasted image 20240827195025.png",
|
||||||
"300s School/302. NUCE 2100 - Fundamentals of Nuclear Engineering/Pasted image 20240827193439.png",
|
"300s School/302. NUCE 2100 - Fundamentals of Nuclear Engineering/Pasted image 20240827193439.png",
|
||||||
"300s School/302. NUCE 2100 - Fundamentals of Nuclear Engineering/Pasted image 20240827190612.png",
|
"300s School/302. NUCE 2100 - Fundamentals of Nuclear Engineering/Pasted image 20240827190612.png"
|
||||||
"302. NUCE 2100 - Fundamentals of Nuclear Engineering/Pasted image 20240827195025.png",
|
|
||||||
"302. NUCE 2100 - Fundamentals of Nuclear Engineering/Pasted image 20240827193439.png",
|
|
||||||
"302. NUCE 2100 - Fundamentals of Nuclear Engineering/Pasted image 20240827190612.png"
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
4
giter_done.sh
Executable file
4
giter_done.sh
Executable file
@ -0,0 +1,4 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
git fetch --all
|
||||||
|
git reset --hard origin/master
|
||||||
|
git pull
|
||||||
Loading…
x
Reference in New Issue
Block a user