Correct git issue

Author: droans

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