merge conflict

2023-08-13 10:23:08 -04:00
parent 77eb1eaddd 639a143083
commit ee0e6182e8
2 changed files with 7 additions and 2 deletions
--- a/ansible/main.yml
+++ b/ansible/main.yml
@@ -24,8 +24,13 @@
    - barassistant
    - mealie
    - searxng
+<<<<<<< HEAD
    - firefly3
    - name: qbittorrent
+=======
+    - sabnzbd
+    - name: firefly3
+>>>>>>> refs/remotes/origin/master
      tags: test
    - unifi-controller
    - slskd