From a5f44d0c86eda0bac435324c1d5eea397e6f0f19 Mon Sep 17 00:00:00 2001
From: Thaddeus Hughes <hughes.thad@gmail.com>
Date: Sun, 26 Oct 2025 23:13:28 -0500
Subject: [PATCH] x

---
 .obsidian/workspace.json | 58 ++++++++++++++++++++++++++++++++++++++++
 14Oct2025.md             |  7 +++++
 2 files changed, 65 insertions(+)

diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index f9e0def..e890a6f 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -13,12 +13,20 @@
             "state": {
               "type": "markdown",
               "state": {
+<<<<<<< Updated upstream
                 "file": "21Oct2025.md",
+=======
+                "file": "14Oct2025.md",
+>>>>>>> Stashed changes
                 "mode": "source",
                 "source": false
               },
               "icon": "lucide-file",
+<<<<<<< Updated upstream
               "title": "21Oct2025"
+=======
+              "title": "14Oct2025"
+>>>>>>> Stashed changes
             }
           }
         ]
@@ -173,9 +181,59 @@
   },
   "active": "653dae5f977f9d0d",
   "lastOpenFiles": [
+<<<<<<< Updated upstream
     "Meat Processing.md",
     "21Oct2025.md",
     "Freezer Space.md",
     "19Oct2025.md"
+=======
+    "Journaling.md",
+    "14Oct2025.md",
+    "Chicory Tea.md",
+    "Freezer Space.md",
+    "Catholic Intranet.md",
+    "Catholic Action.md",
+    "13OCT2025.md",
+    "12Oct2025.md",
+    "11Oct2025.md",
+    "Shopping List.md",
+    "Timeclock.md",
+    "Walnut for Dewormer.md",
+    "Week of 05OCT2025.md",
+    "Shop Rate.md",
+    "stockcropper/SC-PUNCHLIST.md",
+    "stockcropper/Notes from assembly 13SEP2025.md",
+    "Habits and Orarion.md",
+    "Drafts/AI - Barnes, Kempf.md",
+    "Archive/12 categories of work.ods",
+    "Archive/72tools.odt",
+    "Archive/cenecal_of_the_car.md",
+    "cenecal_of_the_car.md",
+    "Drafts/pretty iesu.md",
+    "pretty iesu.md",
+    "Archive/theo_work_qs.odt",
+    "Archive/theology_of_work.odt",
+    "Archive/Principles of Catholic Community Building.odt",
+    "Archive/identity_v_roles.docx",
+    "Archive/08Oct2025.md",
+    "Archive/08Oct2025 (conflicted copy 2025-10-08 100248).md",
+    "Amazon Running Returns List.md",
+    "amazon returns running.md",
+    "stockcropper/1096-05.jpg",
+    "274663921659.jpeg",
+    "274039228009.jpeg",
+    "274039825309.jpeg",
+    "Untitled 3",
+    "Untitled 2",
+    "Untitled 1",
+    "Stock Cropper/1096-05.jpg",
+    "Stock Cropper/Pasted image 20250926101243.png",
+    "Stock Cropper/SC Electronics Architecture.pdf",
+    "Stock Cropper/strider-linkage-with-and-without-toes-15_orig.gif",
+    "THF/51utv4Pw0sL._SL1100_.jpg",
+    "THF/control-systems-CON.1609.WP.3.jpg",
+    "THF/s-l400.jpg",
+    "Untitled/Untitled.canvas"
+>>>>>>> Stashed changes
   ]
 }
\ No newline at end of file
diff --git a/14Oct2025.md b/14Oct2025.md
index 5afdc94..bbe16af 100644
--- a/14Oct2025.md
+++ b/14Oct2025.md
@@ -6,8 +6,11 @@
 - [ ] Listen to Anxiety
 - [ ] Read SC agreement 
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 - [ ] 
 =======
+=======
+>>>>>>> Stashed changes
 
 https://substack.com/home/post/p-171966411
 # Journaling
@@ -86,5 +89,9 @@ Make no compromise with evil
 - You SHOULD - there can be other fruits that come of this
 - You SHOULD - it is a way to grow in knowledge and ability to make things
 - You SHOULD NOT - you need to be invested and in the driver's seat
+<<<<<<< Updated upstream
+- You SHOULD NOT - you are too geographically decentered
+>>>>>>> Stashed changes
+=======
 - You SHOULD NOT - you are too geographically decentered
 >>>>>>> Stashed changes