1 files changed, 4 insertions, 0 deletions

diff --git a/Cargo.lock b/Cargo.lock
index f84845d..28eecc8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -248,6 +248,7 @@ dependencies = [
 name = "soon"
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 version = "0.1.3"
 =======
 version = "0.1.1"
@@ -255,6 +256,9 @@ version = "0.1.1"
 =======
 version = "0.1.2"
 >>>>>>> fc7b603 (feat:  Bump version to 0.1.2 in Cargo.toml, Cargo.lock, and PKGBUILD)
+=======
+version = "0.1.2"
+>>>>>>> dab388da8e452a4f82f1297bf20c48254028d1c1
 dependencies = [
  "clap",
  "colored",