From d8d738f8aea4198f85b5dae3610a3d6661692ed0 Mon Sep 17 00:00:00 2001
From: Michael Carroll <xavier2cowboys@gmail.com>
Date: Mon, 13 Mar 2023 10:08:13 -0400
Subject: [PATCH] Correct git issue

---
 extended_macro/extended_macro_updater.conf | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/extended_macro/extended_macro_updater.conf b/extended_macro/extended_macro_updater.conf
index 5816f76..ca90fe4 100644
--- a/extended_macro/extended_macro_updater.conf
+++ b/extended_macro/extended_macro_updater.conf
@@ -4,10 +4,6 @@ primary_branch: main
 path: ~/klipper_extras
 origin: https://github.com/droans/klipper_extras.git
 env: ~/klippy-env/bin/python
-<<<<<<< HEAD
 install_script: extended_macro/deps.sh #Moonraker only cares about the dependencies.
-=======
-install_script: extended_macro/install.sh
->>>>>>> b5b5a39 (Remove hardcoded requirements path)
 is_system_service: False
 managed_services: klipper
\ No newline at end of file