ehh?

3 years ago · d93b2109f4
parent bdf10462d2
commit d93b2109f4
1 changed files with 0 additions and 4 deletions
--- a/setup.yml
+++ b/setup.yml
@ -55,8 +55,4 @@
    - matrix-aux
    - matrix-postgres-backup
    - matrix-prometheus-postgres-exporter
-<<<<<<< HEAD
    - matrix-common-after
-=======
-    - matrix-common-after
->>>>>>> upstream/master