From c597a20d00090b86ec7be042b2482bcbc36b57b6 Mon Sep 17 00:00:00 2001
From: monty <rythewuff@gmail.com>
Date: Mon, 9 Dec 2019 00:12:02 +0100
Subject: [PATCH] x

---
 server.js | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/server.js b/server.js
index 115cca9..dbc4021 100644
--- a/server.js
+++ b/server.js
@@ -102,28 +102,7 @@ module.exports = (client) => {
 				success: false,
 				message: 'You are not authorized to access this Endpoint'
 			});
-<<<<<<< HEAD
 		}
-=======
-		} else {
-		await exec('git pull')
-			.then((r) => {
-				console.log('Pulled latest changes');
-				res.status(200).jsonp({
-					success: true,
-					message: 'Successfully pulled latest changes'
-				});
-				trying.edit('```fix\n' + r.stdout + '```');
-			})
-			.catch((error) => {
-				res.status(400).jsonp({
-					success: false,
-					message: error.message
-				});
-				console.error(error);
-			});
-			}
->>>>>>> 5299c2efc2d2e6d7f232b54122bc92a27eacdf19
 	});
 
 	app.listen(port /* , hostname */, () => {