From b93d2369ea229bbd3e5ce5b16ab67d847389e951 Mon Sep 17 00:00:00 2001
From: vanderweiss <acertig04@gmail.com>
Date: Fri, 13 Sep 2024 17:30:51 -0500
Subject: [PATCH] oops, anyways bump

---
 Cargo.toml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index df670d8..b412160 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,7 +4,6 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-<<<<<<< HEAD
 clap = { version = "4.5.17", default-features = false, features = ["std", "color", "help", "usage", "derive", "cargo"] }
 dirs = "5.0.1"
 
@@ -20,5 +19,3 @@ opt-level = "z"
 lto = true
 strip = true
 panic = "abort"
-=======
->>>>>>> refs/remotes/origin/main