From 86f996c7ea4f78513f9ef3dcf22c4a8933f96180 Mon Sep 17 00:00:00 2001
From: slegro97 <sam.legro97@gmail.com>
Date: Mon, 29 Jul 2024 20:00:47 -0400
Subject: [PATCH] added name to contributors list

---
 CONTRIBUTORS.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 2255b7f31e..129fe34d25 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -18,8 +18,5 @@
 - [@Kranjec023](https://github.com/Kranjec023)
 - [@lone4d7](https://github.com/lone4d7)
 - [@gops26](https://github.com/gops26)
-<<<<<<< HEAD
-- [@slegro97](https://github.com/slegro97)
-=======
 - [@dawnhajdu](https://github.com/dawnhajdu)
->>>>>>> 081e976935a7210357791a083d8d89c7c42117df
+- [@slegro97](https://github.com/slegro97)