From bf69399a6a5fb29083d3bbcdcff4f7e68d8fede3 Mon Sep 17 00:00:00 2001
From: Mirei <42766108+mahdibland@users.noreply.github.com>
Date: Wed, 26 Oct 2022 23:56:11 +0330
Subject: [PATCH] update state

---
 sub/sub_list.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/sub/sub_list.json b/sub/sub_list.json
index efc440e1c..d81618dd5 100644
--- a/sub/sub_list.json
+++ b/sub/sub_list.json
@@ -495,7 +495,6 @@
     "update_method": "auto",
     "enabled": true
   },
-<<<<<<< HEAD
   {
     "id": 62,
     "remarks": "songtao1873/providers",
@@ -504,8 +503,6 @@
     "update_method": "auto",
     "enabled": true
   },
-=======
->>>>>>> 2f97044c0c70742a6a8b7f7ef58990d1959e6dbf
   {
     "id": 63,
     "remarks": "Unknown",