missed merge conflict

Author: wtripp180901

environments/.stackhpc/hooks/post.yml

@@ -12,15 +12,3 @@
         - "/opt/ood/ondemand/root/usr/share/gems/3.1/ondemand/{{ ondemand_package_version }}-1/gems/bootstrap_form-2.7.0/test/dummy/Gemfile.lock"
         - "/opt/ood/ondemand/root/usr/share/gems/3.1/ondemand/{{ ondemand_package_version }}-1/gems/bootstrap_form-4.5.0/demo/yarn.lock"
         - /var/www/ood/apps/sys/dashboard/node_modules/data-confirm-modal/Gemfile.lock
-<<<<<<< HEAD
-=======
-
-- hosts: builder
-  become: yes
-  tasks:
-    - name: Disable ark repos
-      ansible.builtin.include_role:
-        name: dnf_repos
-        tasks_from: disable_repos.yml
-      when: ansible_distribution_major_version == "9" #TODO update role once RL8 config decided
->>>>>>> main