1 files changed, 0 insertions, 3 deletions
diff --git a/cat.py b/cat.py
index d597470..6281e89 100644
--- a/cat.py
+++ b/cat.py
@@ -101,10 +101,7 @@ class VnilCat:
 			status += "\n"
 			status += n["url"]
 			status += "\n\n"
-<<<<<<< HEAD
-=======
 		status += "randomly taken from - https://news.ycombinator.com/"
->>>>>>> 95c5afd (chore)
 		self.session.toot(status)