1 files changed, 0 insertions, 4 deletions

diff --git a/Cargo.toml b/Cargo.toml
index b5a6164..2209a7d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,10 +1,6 @@
 [package]
 name = "soon"
-<<<<<<< HEAD
 version = "0.1.3"
-=======
-version = "0.1.1"
->>>>>>> 63967be (feat:  Bump version to 0.1.1 in Cargo.toml and Cargo.lock)
 edition = "2021"
 description = "Predict your next shell command based on history — like shell autocomplete, but MORE stupid"
 license = "MIT"