uncommited merge conflict solved

digitalist-se · Sep 21, 2024 · c8f5661 · c8f5661
1 parent 0f16c46
commit c8f5661
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,21 +1,17 @@
 # Change log
 
-<<<<<<< HEAD
 ## [0.9.08] - 2024-09-21
 
 ### Added
 
 - Example overrides in example folder.
 
-||||||| f3b1c4b
-=======
 ## [0.9.07] - 2024-09-21
 
 ### Fixed
 
 - Add back pathType for ingress
 
->>>>>>> 66634b7062186818a1c6aa0947df07f8b0fd0592
 ## [0.9.06] - 2024-09-21
 
 ### Changed