From 61e55ab9bff6906a010f78e166068aadd8c1cb84 Mon Sep 17 00:00:00 2001
From: Tianhao Wang <wth@riseup.net>
Date: Thu, 26 Oct 2023 20:49:47 +0000
Subject: fix mistake

---
 cat.py | 3 ---
 1 file changed, 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)
 
 
-- 
cgit v1.2.3-70-g09d2