Correct git issue

droans · Mar 13, 2023 · d8d738f · d8d738f
1 parent fe91d62
commit d8d738f
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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