From 5771321a356168a3a1ee978dcb016a64c4590bf5 Mon Sep 17 00:00:00 2001
From: Kyomotoi <0w0@imki.moe>
Date: Thu, 13 Oct 2022 22:03:42 +0800
Subject: =?UTF-8?q?=F0=9F=94=A5=20=E5=88=A0=E9=99=A4=20git=20=E5=8F=91?=
 =?UTF-8?q?=E7=97=85=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ATRI/plugins/repo.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ATRI/plugins/repo.py b/ATRI/plugins/repo.py
index 1c53d58..c550f4b 100644
--- a/ATRI/plugins/repo.py
+++ b/ATRI/plugins/repo.py
@@ -14,7 +14,6 @@ from ATRI.message import MessageBuilder
 _repo_flmt_notice = choice(["慢...慢一..点❤", "冷静1下", "歇会歇会~~"])
 
 
-<<<<<<< HEAD
 _REPO_FORMAT = (
     MessageBuilder("来自用户{user}反馈:")
     .text("{msg}")
@@ -22,9 +21,7 @@ _REPO_FORMAT = (
     .text("- 无需担心, 关注其它内容即可")
     .done()
 )
-=======
 _REPO_FORMAT = MessageBuilder("来自用户{user}反馈:").text("{msg}").done()
->>>>>>> 83a9fb95251c173b2394b668aab1b63908af5f29
 
 
 repo = Service("反馈", "向维护者发送消息", rule=is_in_service("反馈"))
-- 
cgit v1.2.3