vault backup: 2025-12-20 23:33:28

content/.obsidian/workspace.json

@@ -34,10 +34,17 @@
             "state": {
               "type": "pdf",
               "state": {
+<<<<<<< HEAD
                 "file": "Anatomi & Histologi 2/Gamla tentor/2023-05-31/!2023-05-31-0100-DKS.pdf"
               },
               "icon": "lucide-file-text",
               "title": "!2023-05-31-0100-DKS"
+=======
+                "file": "Anatomi & Histologi 2/Öga anatomi/Slides.pdf.pdf"
+              },
+              "icon": "lucide-file-text",
+              "title": "Slides.pdf"
+>>>>>>> 35528c6 (vault backup: 2025-12-20 23:33:28)
             }
           }
         ]
@@ -72,7 +79,11 @@
             "state": {
               "type": "search",
               "state": {
+<<<<<<< HEAD
                 "query": "spoiler-",
+=======
+                "query": "tag:#provfråga lager ",
+>>>>>>> 35528c6 (vault backup: 2025-12-20 23:33:28)
                 "matchingCase": false,
                 "explainSearch": false,
                 "collapseAll": false,
@@ -83,7 +94,8 @@
               "title": "Search"
             }
           }
-        ]
+        ],
+        "currentTab": 1
       }
     ],
     "direction": "horizontal",
@@ -103,12 +115,20 @@
             "state": {
               "type": "outgoing-link",
               "state": {
+<<<<<<< HEAD
                 "file": "Biokemi/Plasmidlabb/Provfrågor.md",
+=======
+                "file": "Anatomi & Histologi 2/Öga anatomi/Slides.pdf.pdf",
+>>>>>>> 35528c6 (vault backup: 2025-12-20 23:33:28)
                 "linksCollapsed": false,
                 "unlinkedCollapsed": true
               },
               "icon": "links-going-out",
+<<<<<<< HEAD
               "title": "Outgoing links from Provfrågor"
+=======
+              "title": "Outgoing links from Slides.pdf"
+>>>>>>> 35528c6 (vault backup: 2025-12-20 23:33:28)
             }
           },
           {
@@ -192,7 +212,11 @@
       }
     ],
     "direction": "horizontal",
+<<<<<<< HEAD
     "width": 212.5,
+=======
+    "width": 423.5,
+>>>>>>> 35528c6 (vault backup: 2025-12-20 23:33:28)
     "collapsed": true
   },
   "left-ribbon": {
@@ -211,6 +235,7 @@
   },
   "active": "baa45c5e57825965",
   "lastOpenFiles": [
+<<<<<<< HEAD
     "Anatomi & Histologi 2/Gamla tentor/2023-05-31/7.md",
     "Anatomi & Histologi 2/Gamla tentor/2023-05-31/6.md",
     "Anatomi & Histologi 2/Gamla tentor/2023-05-31/5.md",
@@ -257,6 +282,44 @@
     "attachments/image-112.png",
     "Anatomi & Histologi 2/Gamla tentor/2025-06-03/!2025-06-03-0003-UJR.pdf",
     "Anatomi & Histologi 2/Gamla tentor/2025-02-08/!2025-02-08-0003-ESW.pdf",
+=======
+    "Anatomi & Histologi 2/Öga anatomi/Organa sensum.pdf",
+    "Anatomi & Histologi 2/Öga anatomi/Slides.pdf.pdf",
+    "Anatomi & Histologi 2/Gamla tentor/2025-08-08/25.md",
+    "Anatomi & Histologi 2/Gamla tentor/2025-01-15/29.md",
+    "Anatomi & Histologi 2/Gamla tentor/2025-02-08/32.md",
+    "Anatomi & Histologi 2/Öga anatomi/Oculus.md.md",
+    "Anatomi & Histologi 2/Gamla tentor/2025-01-15/4.md",
+    "Anatomi & Histologi 2/Öga anatomi/Målbeskrivning.md",
+    "Anatomi & Histologi 2/Gamla tentor/2022-01-15/23.md",
+    "Anatomi & Histologi 2/Gamla tentor/2024-01-10/24.md",
+    "Anatomi & Histologi 2/Gamla tentor/2025-02-08/29.md",
+    "Anatomi & Histologi 2/Gamla tentor/2025-02-08/30.md",
+    "Anatomi & Histologi 2/Öga anatomi/Instuderingsfrågor.md",
+    "Anatomi & Histologi 2/Gamla tentor/Statistik.md",
+    "Anatomi & Histologi 2/Gamla tentor/2025-08-08/2025-08-08-0030-SHJ.pdf",
+    "Anatomi & Histologi 2/Gamla tentor/2025-08-08/2025-08-08-0030-SHJ.md",
+    "Anatomi & Histologi 2/Gamla tentor/2025-02-08/2025-02-08-0003-ESW.pdf",
+    "Anatomi & Histologi 2/Gamla tentor/2025-02-08/2025-02-08.md",
+    "Anatomi & Histologi 2/Gamla tentor/2025-06-03/2025-06-03-0003-UJR.pdf",
+    "Anatomi & Histologi 2/Gamla tentor/2025-08-08/1.md",
+    "Biokemi/Gamla tentor/2021-12-16/2021-12-16-0073-AXA.pdf",
+    "Anatomi & Histologi 2/Öra histologi/~$Ögat histologi handout.pptx",
+    "Anatomi & Histologi 2/Öga histologi/~$Ögat histologi handout.pptx",
+    "Anatomi & Histologi 2/Gamla tentor/Anatomi och Histologi 2 av Nils.apkg",
+    "Anatomi & Histologi 2/Gamla tentor/2022-01-06-adrihajdu-Anatomi och histologi 2 quiz.docx",
+    "z-Tech/Undvika mekanisk memorering – AI-stödd studieteknik.md",
+    "Biokemi/Metabolism/🩸 Heme/Studera.md",
+    "Anatomi & Histologi 2/Öra histologi/Målbeskrivning.md",
+    "Anatomi & Histologi 2/Öra histologi/Instuderingsfrågor.md",
+    "Anatomi & Histologi 2/Öra histologi/25 Ear.md",
+    "Anatomi & Histologi 2/Öra anatomi/Målbeskrivning.md",
+    "Anatomi & Histologi 2/Öra anatomi/Slides.md",
+    "Anatomi & Histologi 2/Öra anatomi/Instuderingsfrågor.md",
+    "Anatomi & Histologi 2/Öra anatomi/Auris.md.md",
+    "Anatomi & Histologi 2/Öga histologi/Slides.md",
+    "attachments/Pasted image 20251128080404.png",
+>>>>>>> 35528c6 (vault backup: 2025-12-20 23:33:28)
     "Untitled.canvas",
     "Biokemi/Metabolism/👋 Introduktion till metabolismen/Untitled.canvas",
     "Biokemi/Metabolism/📋 Metabolismen översikt.canvas",

content/Anatomi & Histologi 2/1 Öga anatomi/Målbeskrivning.md

@@ -1,13 +1,13 @@
 
-- Palpebrae och conjunctiva  
-- Ögats yttersta lager: sclera och cornea  
-- Ögats mellersta lager (uvea): choroidea, corpus ciliare (inkl. processus ciliares), iris, pupilla  
-- Linsen (lens): uppbyggnad och funktion  
-- Corpus vitreum (glaskroppen)  
-- Ögats innersta lager: retina (endast makroskopisk indelning)  
+- Palpebrae och ==conjunctiva==
+- Ögats yttersta lager: ==sclera== och ==cornea==
+- Ögats mellersta lager (uvea): ==choroidea==, corpus ==ciliare== (inkl. processus ciliares (1)), ==iris==, pupilla (1)
+- ==Linsen== (lens): uppbyggnad och funktion  
+- Corpus ==vitreum== (glaskroppen)  
+- Ögats innersta lager: ==retina== (endast makroskopisk indelning)  
 - Synens koppling till CNS:
-  - Nervus opticus  (gangliecellers axon)
-  - Chiasma opticum  
+  - ==Nervus opticus== (gangliecellers axon)
+  - Chiasma opticum (1)
   - Tractus opticus  
   - Radiatio optica  
   - Synkortex (primära syncortex)

content/conflict-files-obsidian-git.md

@@ -0,0 +1,17 @@
+# 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: content/.obsidian/workspace.json
+
+# 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
+```