From bec485287fdab523a1e875b01779eaf315834314 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gehrke?=
 <5106696+b-gehrke@users.noreply.github.com>
Date: Wed, 26 Jun 2024 11:32:53 +0200
Subject: [PATCH] Corrected version

---
 Cargo.toml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Cargo.toml b/Cargo.toml
index 5f31fbf..cd71c57 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,10 @@
 [package]
 name = "py-horned-owl"
+<<<<<<< Updated upstream
 version = "1.0.0-dev.1"
+=======
+version = "1.0.0-dev1"
+>>>>>>> Stashed changes
 authors = ["Janna Hastings <j.hastings@ucl.ac.uk>"]
 edition = "2018"