From db8f8a98c97cf57b71998f5bb60a62a0519ec4e5 Mon Sep 17 00:00:00 2001
From: Jan Mas Rovira <janmasrovira@gmail.com>
Date: Mon, 28 Mar 2022 09:40:51 +0200
Subject: [PATCH] fix package.yaml

---
 package.yaml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/package.yaml b/package.yaml
index 6a06a5c57..1892c5197 100644
--- a/package.yaml
+++ b/package.yaml
@@ -1,9 +1,5 @@
 name:            minijuvix
-<<<<<<< HEAD
-version:         0.1.0
-=======
 version:         0.1.1
->>>>>>> origin/main
 license:         GPL-3.0-only
 license-file:    LICENSE
 copyright:       (c) 2022- Heliax AG.
@@ -81,9 +77,6 @@ default-extensions:
 - TypeFamilyDependencies
 - UnicodeSyntax
 
-# verbatim:
-#   default-language: GHC2021
-
 library:
   source-dirs: src
   verbatim: