merge

.obsidian/workspace.json

@@ -4,6 +4,7 @@
     "type": "split",
     "children": [
       {
+<<<<<<< HEAD
         "id": "67e837316d037dc4",
         "type": "tabs",
         "children": [
@@ -23,21 +24,46 @@
           },
           {
             "id": "69c870afe5808750",
+=======
+        "id": "b488fa5ce7860fda",
+        "type": "tabs",
+        "children": [
+          {
+            "id": "0e37fc83d4cab986",
+>>>>>>> b054a46a01eaba7303abbc131618644c05965d75
             "type": "leaf",
             "state": {
               "type": "markdown",
               "state": {
-                "file": "Stephen's Salt Idea.md",
+                "file": "28OCT2025.md",
                 "mode": "source",
                 "source": false
               },
               "icon": "lucide-file",
-              "title": "Stephen's Salt Idea"
+              "title": "28OCT2025"
+            }
+          },
+          {
+            "id": "b07d58cd0406189f",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "28OCT2025.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "28OCT2025"
             }
           }
         ],
+<<<<<<< HEAD
         "currentTab": 1,
         "stacked": true
+=======
+        "currentTab": 1
+>>>>>>> b054a46a01eaba7303abbc131618644c05965d75
       }
     ],
     "direction": "vertical"
@@ -184,6 +210,7 @@
       "table-editor-obsidian:Advanced Tables Toolbar": false
     }
   },
+<<<<<<< HEAD
   "active": "69c870afe5808750",
   "lastOpenFiles": [
     "Linux reference.md",
@@ -218,6 +245,39 @@
     "Untitled.base",
     "Farm",
     "Untitled.canvas",
+=======
+  "active": "b07d58cd0406189f",
+  "lastOpenFiles": [
+    "Farm/PPI-PUNCHLIST.md",
+    "28OCT2025.md",
+    "Timeclock.md",
+    "Stephen's Salt Idea.md",
+    "27Oct2025.md",
+    "stockcropper/Shop Rate.md",
+    "mxd/the damndest of apples.md",
+    "mxd/Ruminants Ex Deo.md",
+    "mxd/Ruminants Ex Deo 1.md",
+    "mxd/Reply to this AI worship nonsense.md",
+    "mxd/Reply to Kingsnorth.md",
+    "mxd/Reply to Kingsnorth 1.md",
+    "mxd/pretty iesu.md",
+    "mxd/MXD-PUNCHLIST.md",
+    "mxd/Nature-al design.md",
+    "mxd/Divine Light Fading.md",
+    "mxd/Bio-Mimickry or Bio-Mockery.md",
+    "mxd/Bio-Mimickry or Bio-Mockery 2.md",
+    "mxd/AI - Barnes, Kempf.md",
+    "mxd/Bio-Mimickry or Bio-Mockery 1.md",
+    "mxd/Bechamp, or Pasteur.md",
+    "mxd/A few months of shepherding.md",
+    "mxd/A few months of shepherding 1.md",
+    "mxd",
+    "THF/THF-PUNCHLIST.md",
+    "Shop/SHOP-PUNCHLIST.md",
+    "Shop",
+    "Farm/Walnut for Dewormer.md",
+    "Farm",
+>>>>>>> b054a46a01eaba7303abbc131618644c05965d75
     "274039825309.jpeg",
     "274039228009.jpeg",
     "THF/Pasted image 20241130114206.png",