From b2e6e2c92d0fda2966e424e29038e7e6f0e42823 Mon Sep 17 00:00:00 2001
From: Darius Kazemi <darius.kazemi@gmail.com>
Date: Sun, 12 Jan 2020 18:17:54 -0800
Subject: fixup

---
 routes.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/routes.js b/routes.js
index 8e480e6..d3b8c82 100755
--- a/routes.js
+++ b/routes.js
@@ -1092,7 +1092,6 @@ router.post('/deleteevent/:eventID/:editToken', (req, res) => {
 				eventImage = event.image;
 			}
 
-<<<<<<< HEAD
       // broadcast a Delete profile message to all followers so that at least Mastodon servers will delete their local profile information
       const guidUpdateObject = crypto.randomBytes(16).toString('hex');
       const jsonUpdateObject = JSON.parse(event.activityPubActor);
-- 
cgit v1.2.3