fix: merge conflicts

Author: drupol

resources/typst/configuration-management.typ

@@ -7,7 +7,7 @@
     #set align(bottom)
     #figure(
       {
-        set text(font: "Virgil 3 YOFF")
+        set text(font: "Virgil")
         cetz.canvas({
           cetz.draw.set-style(axes: (shared-zero: false))
 
@@ -48,7 +48,7 @@
     #set align(bottom)
     #figure(
       {
-        set text(font: "Virgil 3 YOFF")
+        set text(font: "Virgil")
         cetz.canvas({
           cetz.draw.set-style(axes: (shared-zero: false))
 
@@ -99,7 +99,7 @@
     #set align(bottom)
     #figure(
       {
-        set text(font: "Virgil 3 YOFF")
+        set text(font: "Virgil")
         cetz.canvas({
           cetz.draw.set-style(axes: (shared-zero: false))
 

src/thesis/literature.bib

@@ -1104,17 +1104,3 @@ @misc{ThoughtsOnSystemsManagementMethods
   year   = 2016,
   url    = {https://flyingcircus.io/news/detailsansicht/thoughts-on-systems-management-methods}
 }
-
-@misc{python-dockerfile-repository,
-  title  = {Python 3.12 Dockerfile},
-  author = {docker-library project1},
-  year   = 2024,
-  url    = {https://github.com/docker-library/python/blame/31bbb37b797bd5521d6622c6d54052d6d0ede585/3.12/bookworm/Dockerfile}
-}
-
-@misc{dockerofficialimages,
-  title  = {What are official images},
-  author = {Docker Inc.},
-  year   = 2024,
-  url    = {https://github.com/docker-library/official-images/blob/6b4803e65a2c56f15b91f8a11bd90f0bcb756c1c/README.md#what-are-official-images},
-}