From 50441346d3a252bc719f2e562cb62c4fa5b5d9bb Mon Sep 17 00:00:00 2001
From: Michael Collins <gomatrixhosting@tutanota.com>
Date: Tue, 17 Aug 2021 16:12:16 +0800
Subject: [PATCH] herp

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

diff --git a/setup.yml b/setup.yml
index 4ac807bc..076a5f7a 100755
--- a/setup.yml
+++ b/setup.yml
@@ -1,8 +1,4 @@
 ---
-<<<<<<< HEAD
-# testing changes 2
-=======
->>>>>>> upstream/master
 - name: "Set up a Matrix server"
   hosts: "{{ target if target is defined else 'matrix_servers' }}"
   become: true