merge

Obsidian Vault/.obsidian/appearance.json

@@ -1,8 +1,3 @@
 {
-<<<<<<< HEAD
   "accentColor": ""
-=======
-  "accentColor": "#008ee6",
-  "theme": "system"
->>>>>>> 627bb37153eab16ab5efd2cefe338df9d3b9113c
 }

Obsidian Vault/.obsidian/community-plugins.json

@@ -5,26 +5,17 @@
   "calendar",
   "obsidian-checklist-plugin",
   "dataview",
-<<<<<<< HEAD
   "obsidian-day-planner",
   "obsidian-dice-roller",
   "obsidian-excalidraw-plugin",
   "obsidian-excel-to-markdown-table",
-=======
-  "obsidian-dice-roller",
-  "obsidian-day-planner",
-  "obsidian-excel-to-markdown-table",
-  "obsidian-excalidraw-plugin",
->>>>>>> 627bb37153eab16ab5efd2cefe338df9d3b9113c
   "obsidian-full-calendar",
   "homepage",
   "obsidian-icons-plugin",
-  "obsidian-kanban",
   "obsidian-mind-map",
+  "obsidian-kanban",
   "obsidian-charts",
   "obsidian-git",
   "obsidian-projects",
-  "quick-latex",
+  "quick-latex"
-  "obsidian-tasks-plugin",
-  "obsidian-textgenerator-plugin"
 ]

Obsidian Vault/.obsidian/core-plugins-migration.json

@@ -20,11 +20,7 @@
   "random-note": false,
   "outline": true,
   "word-count": true,
-<<<<<<< HEAD
   "slides": false,
-=======
-  "slides": true,
->>>>>>> 627bb37153eab16ab5efd2cefe338df9d3b9113c
   "audio-recorder": false,
   "workspaces": false,
   "file-recovery": true,

Obsidian Vault/.obsidian/core-plugins.json

@@ -16,9 +16,5 @@
   "bookmarks",
   "outline",
   "word-count",
-<<<<<<< HEAD
-=======
-  "slides",
->>>>>>> 627bb37153eab16ab5efd2cefe338df9d3b9113c
   "file-recovery"
 ]

Obsidian Vault/.obsidian/plugins/obsidian-projects/data.json

@@ -1,166 +1,6 @@
 {
   "version": 2,
-<<<<<<< HEAD
   "projects": [],
-=======
-<<<<<<< HEAD
-  "projects": [],
-=======
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
->>>>>>> a6041c518c4ba0c8190b01570e847b4d4fd814f3
-  "projects": [
-    {
-      "fieldConfig": {},
-      "defaultName": "",
-      "templates": [],
-      "excludedNotes": [],
-      "isDefault": false,
-      "dataSource": {
-        "kind": "folder",
-        "config": {
-<<<<<<< HEAD
-          "path": "Test",
-          "recursive": true
-=======
-          "path": "Projects - Demo Project",
-          "recursive": false
->>>>>>> a6041c518c4ba0c8190b01570e847b4d4fd814f3
-        }
-      },
-      "newNotesFolder": "",
-      "views": [
-        {
-          "config": {
-            "fieldConfig": {
-              "name": {
-<<<<<<< HEAD
-                "hide": false
-              },
-              "path": {
-                "hide": false
-=======
-                "width": 360
-              },
-              "path": {
-                "hide": true
->>>>>>> a6041c518c4ba0c8190b01570e847b4d4fd814f3
-              }
-            }
-          },
-          "filter": {
-            "conditions": []
-          },
-          "colors": {
-            "conditions": []
-          },
-          "sort": {
-            "criteria": []
-          },
-<<<<<<< HEAD
-          "id": "f9f98a9a-393d-41e1-8275-da9c05aa8c47",
-          "name": "Table",
-=======
-          "name": "Table",
-          "id": "269a945e-3f6b-4f73-9477-2461dc470d7e",
->>>>>>> a6041c518c4ba0c8190b01570e847b4d4fd814f3
-          "type": "table"
-        },
-        {
-          "config": {
-<<<<<<< HEAD
-            "columns": {
-              "No status": {
-                "weight": 0
-              }
-            }
-=======
-            "groupByField": "status",
-            "priorityField": "weight"
->>>>>>> a6041c518c4ba0c8190b01570e847b4d4fd814f3
-          },
-          "filter": {
-            "conditions": []
-          },
-          "colors": {
-            "conditions": []
-          },
-          "sort": {
-            "criteria": []
-          },
-<<<<<<< HEAD
-          "id": "56270545-1ef3-4da4-a92d-df649e99271a",
-          "name": "Board",
-          "type": "board"
-        },
-        {
-          "config": {},
-=======
-          "name": "Board",
-          "id": "f7f7c0a4-dde6-4d15-ace9-e53cff485f6e",
-          "type": "board"
-        },
-        {
-          "config": {
-            "interval": "month",
-            "dateField": "due",
-            "checkField": "published"
-          },
->>>>>>> a6041c518c4ba0c8190b01570e847b4d4fd814f3
-          "filter": {
-            "conditions": []
-          },
-          "colors": {
-            "conditions": []
-          },
-          "sort": {
-            "criteria": []
-          },
-<<<<<<< HEAD
-          "id": "1e5973bd-999f-4c1e-a4b1-7d15bf60e3de",
-          "name": "Calendar",
-          "type": "calendar"
-        }
-      ],
-      "id": "23ece400-b449-4d93-83a3-97ceac60a993",
-      "name": "Learning Obsidian"
-    }
-  ],
-=======
-          "name": "Calendar",
-          "id": "82774d4a-ac88-475d-a6f5-6bdaf4cf6173",
-          "type": "calendar"
-        },
-        {
-          "config": {
-            "coverField": "image"
-          },
-          "filter": {
-            "conditions": []
-          },
-          "colors": {
-            "conditions": []
-          },
-          "sort": {
-            "criteria": []
-          },
-          "name": "Gallery",
-          "id": "37898235-e489-4b2e-89de-f0ec06b4e647",
-          "type": "gallery"
-        }
-      ],
-      "name": "Demo project",
-      "id": "46746b45-b7a9-4e46-8dfa-53f530f9c120",
-      "path": "Projects - Demo Project"
-    }
-  ],
-=======
-  "projects": [],
->>>>>>> 983f0c420714dca90718ef88db9d7a176de9c0a9
->>>>>>> a6041c518c4ba0c8190b01570e847b4d4fd814f3
->>>>>>> b753df5d08d43be9e0c0c8d55524e32d17069f88
->>>>>>> 627bb37153eab16ab5efd2cefe338df9d3b9113c
   "preferences": {
     "projectSizeLimit": 1000,
     "frontmatter": {

Obsidian Vault/.obsidian/workspace.json

@@ -13,7 +13,7 @@
             "state": {
               "type": "markdown",
               "state": {
-                "file": "notes/Haus/Garten/Gartenwasserzähler.md",
+                "file": "HV/!ToDo/2023-07 Urlaubsvertretung.md",
                 "mode": "source",
                 "backlinks": false,
                 "source": false
@@ -94,7 +94,7 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "notes/Haus/Garten/Gartenwasserzähler.md",
+                "file": "HV/!ToDo/2023-07 Urlaubsvertretung.md",
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -111,7 +111,7 @@
             "state": {
               "type": "outgoing-link",
               "state": {
-                "file": "notes/Haus/Garten/Gartenwasserzähler.md",
+                "file": "HV/!ToDo/2023-07 Urlaubsvertretung.md",
                 "linksCollapsed": false,
                 "unlinkedCollapsed": true
               }
@@ -134,7 +134,7 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "notes/Haus/Garten/Gartenwasserzähler.md"
+                "file": "HV/!ToDo/2023-07 Urlaubsvertretung.md"
               }
             }
           },
@@ -197,16 +197,17 @@
       "table-editor-obsidian:Advanced Tables Toolbar": false,
       "obsidian-excalidraw-plugin:Create new drawing": false,
       "obsidian-full-calendar:Open Full Calendar": false,
-      "obsidian-projects:Open projects": false,
+      "homepage:Open homepage": false,
-      "obsidian-textgenerator-plugin:Generate Text!": false,
+      "obsidian-projects:Open projects": false
-      "obsidian-textgenerator-plugin:Text Generator: Templates Packages Manager": false,
-      "homepage:Open homepage": false
     }
   },
   "active": "2859d5521601a361",
   "lastOpenFiles": [
-    "notes/HV/Agilent/ADCP (conflicted copy 2023-07-14 123511).md",
+    "Day Planners/Day Planner-20230730.md",
     "HV/Opps/2023/2023-07 Modemann, UIB2.md",
+    "HV/!ToDo/2023-07 Urlaubsvertretung.md",
+    "notes/Haus/Garten/Gartenwasserzähler.md",
+    "notes/HV/Agilent/ADCP (conflicted copy 2023-07-14 123511).md",
     "HV/Opps/2023/Untitled.md",
     "notes/Sascha-@-Agilent-Technologies/media/Schnelle-Notizen-Diegelmann-1200-TradeIn-image3.jpg",
     "notes/Sascha-@-Agilent-Technologies/media/Schnelle-Notizen-Diegelmann-1200-TradeIn-image4.jpg",
@@ -234,7 +235,6 @@
     "notes/Haus/To-Do/Mängel.md",
     "notes/Haus/To-Do/Einkaufen.md",
     "notes/Haus/To-Do/Adresse-ändern.md",
-    "notes/Haus/Garten/Gartenwasserzähler.md",
     "notes/Haus/Garten/Stefan.md",
     "notes/Haus/Garten/Sand-&-Erde.md",
     "notes/Haus/Garten/Mauer.md",
@@ -249,8 +249,6 @@
     "notes/Sascha-@-Agilent-Technologies/Wochenpläne/KW5.md",
     "notes/Sascha-@-Agilent-Technologies/Wochenpläne/KW19.md",
     "notes/Sascha-@-Agilent-Technologies/Wochenpläne/KW4.md",
-    "notes/Sascha-@-Agilent-Technologies/Wochenpläne/KW18.md",
-    "notes/Sascha-@-Agilent-Technologies/Wochenpläne/KW22.md",
     "Einkaufsliste Canvas.canvas",
     "Test/Einkaufsliste Canvas.canvas",
     "Unbenannt.canvas"

Obsidian Vault/Day Planners/Day Planner-20230717.md

@@ -0,0 +1,2 @@
+## Day Planner
+- [ ] 

Obsidian Vault/Day Planners/Day Planner-20230718.md

@@ -0,0 +1,2 @@
+## Day Planner
+- [ ] 

Obsidian Vault/Day Planners/Day Planner-20230728.md

@@ -0,0 +1,2 @@
+## Day Planner
+- [ ] 

Obsidian Vault/Day Planners/Day Planner-20230730.md

@@ -0,0 +1,2 @@
+## Day Planner
+- [ ] 

Obsidian Vault/HV/!ToDo/2023-07 Urlaubsvertretung.md

@@ -4,7 +4,6 @@
 - Intuvo exchange AAA/Novartis
 - Intuvo problems Kuraray
 - WinGPC Update DWI
-<<<<<<< HEAD
 - DGUV / TradeIn Rechnung
 - Life Radiopharma / UIB2
 
@@ -12,6 +11,4 @@
 +49 6021 9204404
 +49 160 97758214
 [achim.sieveritz@non.agilent.com](mailto:achim.sieveritz@non.agilent.com)
-=======
+
-- DGUV / TradeIn Rechnung
->>>>>>> 627bb37153eab16ab5efd2cefe338df9d3b9113c

Obsidian Vault/HV/EGS.md

@@ -1,17 +1,6 @@
-<<<<<<< HEAD
-| Model | EGS |
-| --- | --- |
-| 6890 Plus | 31.03.2013 |
-| 6890N | 31.12.2017 |
-
-[[Agilent]]
-
-#Agilent #Service
-=======
 Model | EGS
 --- | ---
 6890 Plus | 31.03.2013
 6890N | 31.12.2017
 
 [[Agilent]]
->>>>>>> 983f0c420714dca90718ef88db9d7a176de9c0a9

Obsidian Vault/HV/Lattice.md

@@ -14,10 +14,4 @@ Außerdem besteht die Möglichkeit, dass wir Ihnen das Altgerät abkaufen und Si
 
 Sagen Sie mir gerne Bescheid, wenn ich Ihnen ein entsprechendes Angebot oder eine Preisinformation für den Rückkauf im Rahmen einer Neugerätebeschaffung erstellen soll.
 
-<<<<<<< HEAD
+Ansonsten können Sie mich auch sehr gerne bei Rückfragen unter den u.a. Kontaktdaten erreichen.
-Ansonsten können Sie mich auch sehr gerne bei Rückfragen unter den u.a. Kontaktdaten erreichen.
-
-#Agilent #SAP 
-=======
-Ansonsten können Sie mich auch sehr gerne bei Rückfragen unter den u.a. Kontaktdaten erreichen.
->>>>>>> 983f0c420714dca90718ef88db9d7a176de9c0a9

Obsidian Vault/HV/Opps/2023/2023-07 Modemann, UIB2.md

@@ -20,7 +20,11 @@
 - [ ] Meeting
 - [ ] Opp
 - [ ] Preisinformation
+<<<<<<< HEAD
+- [x] Angebot ✅ 2023-07-14
+=======
 - [ ] Angebot
+>>>>>>> 54227ab548fb03480df46176ea2467df9a16f6ad
 - [ ] DRQ
 - [ ] OER
 

Obsidian Vault/HV/Signatur.md

@@ -4,10 +4,4 @@
 <i>Handelsvertretung Sascha Woitschetzki</i><br>
 Parsevalstr. 58, 45470 Mülheim an der Ruhr<br>
 T: +49 208 74129134 / M: +49 176 22285334<br>
-<<<<<<< HEAD
+<a href="mailto:sascha.woitschetzki@handelsvertretung.woitschetzki.de">sascha.woitschetzki@handelsvertretung.woitschetzki.de</a>
-<a href="mailto:sascha.woitschetzki@handelsvertretung.woitschetzki.de">sascha.woitschetzki@handelsvertretung.woitschetzki.de</a>
-
-#Agilent 
-=======
-<a href="mailto:sascha.woitschetzki@handelsvertretung.woitschetzki.de">sascha.woitschetzki@handelsvertretung.woitschetzki.de</a>
->>>>>>> 983f0c420714dca90718ef88db9d7a176de9c0a9

Obsidian Vault/notes/HV/Agilent/ADCP.md

@@ -1,5 +1,3 @@
----
-
 | **ID**   | **Name**          | **Contact**     | **Tel**       | **Comment**       |
 |-----------|------------------|---------------|--------------|----------------|
 | 70351028 | Pharma Aldenhoven | Peter Bolduan   | 0246 458942   | Meeting im August |