From e133977741f650a210e069f4ff49e03774ab82e3 Mon Sep 17 00:00:00 2001
From: Abheek Dhawan <abheekd@protonmail.com>
Date: Sun, 2 May 2021 12:40:36 -0500
Subject: [PATCH] Fix merge tags

---
 bot/awesomescibo.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/bot/awesomescibo.js b/bot/awesomescibo.js
index 4477086..3c699fc 100755
--- a/bot/awesomescibo.js
+++ b/bot/awesomescibo.js
@@ -488,10 +488,7 @@ async function userRounds(message) {
   });
 
   const roundsEmbed = new Discord.MessageEmbed()
-<<<<<<< HEAD
-=======
     .setAuthor(message.author.tag, message.author.displayAvatarURL())
->>>>>>> e70c83d (Change embed title and add author)
     .setTitle(`Last 5 rounds requested by ${message.author.tag}`)
     .setDescription(finalMessage)
     .setTimestamp();