merge conflict
This commit is contained in:
mike committed
commit
ee0e6182e8
2 files changed
+7
-2
No files matched your search
@@ -24,8 +24,13 @@
|
||||
- barassistant
|
||||
- mealie
|
||||
- searxng
|
||||
<<<<<<< HEAD
|
||||
- firefly3
|
||||
- name: qbittorrent
|
||||
=======
|
||||
- sabnzbd
|
||||
- name: firefly3
|
||||
>>>>>>> refs/remotes/origin/master
|
||||
tags: test
|
||||
- unifi-controller
|
||||
- slskd
|
||||
|
||||
Reference in new issue
Block a user