From d93b2109f4f6a4f043bb5a6e1377a843dbd80eca Mon Sep 17 00:00:00 2001
From: Michael Collins <gomatrixhosting@tutanota.com>
Date: Wed, 18 Aug 2021 06:25:49 +0800
Subject: [PATCH] ehh?

---
 setup.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/setup.yml b/setup.yml
index 076a5f7a5..2c0e197ac 100755
--- 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