From 032e6c47c127e58a660d810b84f1e7e2d501fba2 Mon Sep 17 00:00:00 2001
From: Kyomotoi <1172294279@qq.com>
Date: Tue, 18 Aug 2020 00:29:10 +0800
Subject: Update noobList.json

---
 ATRI/plugins/noobList/noobList.json | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'ATRI/plugins')

diff --git a/ATRI/plugins/noobList/noobList.json b/ATRI/plugins/noobList/noobList.json
index 31edd3f..021e00a 100644
--- a/ATRI/plugins/noobList/noobList.json
+++ b/ATRI/plugins/noobList/noobList.json
@@ -1,5 +1 @@
-<<<<<<< HEAD
 {"123": "123"}
-=======
-{"123": "123"}
->>>>>>> eb0c08c0a2d81acd8f1c62f003b348a4a41e1ca7
-- 
cgit v1.2.3