From 5e7cab3e51b5588cfeff6e448311197ce4424c28 Mon Sep 17 00:00:00 2001
From: cyi1341 <cyi1341@disroot.org>
Date: Sun, 29 Oct 2023 21:03:13 +0800
Subject: [PATCH] Fix README

---
 README.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/README.md b/README.md
index ea2429f..6992756 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,5 @@
 # failed_discord_bot
 
-<<<<<<< HEAD
-=======
 A Discord bot that tries to use free and unreliable APIs of various AI models to simulate a Discord user.
 
 To be determined.
->>>>>>> bfa4d8c (Add files)