From df65fdeb02e3cc660c05df59451444060896a675 Mon Sep 17 00:00:00 2001 From: Dane Sabo Date: Tue, 1 Apr 2025 13:14:23 -0400 Subject: [PATCH] vault backup: 2025-04-01 13:14:23 --- 900s Calendars/Research/Research - README.md | 1 + 9999 Personal/Z/Z - README.md | 1 + conflict-files-obsidian-git.md | 18 ------------------ 3 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 conflict-files-obsidian-git.md diff --git a/900s Calendars/Research/Research - README.md b/900s Calendars/Research/Research - README.md index 474ad0b8..cba4e170 100644 --- a/900s Calendars/Research/Research - README.md +++ b/900s Calendars/Research/Research - README.md @@ -28,6 +28,7 @@ - [[2025-03-31 ARCADE EndPoint.md]] - [[2025-03-31 Collect some literature reviews.md]] - [[2025-04-01 Rust.md]] +- [[2025-04-02 Canonical Talk NSH 3305 CMU.md]] ## Summary diff --git a/9999 Personal/Z/Z - README.md b/9999 Personal/Z/Z - README.md index 81892206..46ced146 100644 --- a/9999 Personal/Z/Z - README.md +++ b/9999 Personal/Z/Z - README.md @@ -6,6 +6,7 @@ ## Files - [[A Short List of Everything That's Wrong with the Z.md]] - [[Coilover Options.md]] +- [[Harbor Freight Shopping List.md]] - [[Harness.md]] - [[How will fuel work?.md]] - [[Longer Wheel Studs.md]] diff --git a/conflict-files-obsidian-git.md b/conflict-files-obsidian-git.md deleted file mode 100644 index 179f4cdc..00000000 --- a/conflict-files-obsidian-git.md +++ /dev/null @@ -1,18 +0,0 @@ -# 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: .sessions/Thesis_Notes.vim -- [[A Review of Formal Methods applied to Machine Learning]] - -# 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 -``` \ No newline at end of file