From bc888274061f80aa97c644d2b7bd93af2f89481f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B4=8E?= <slight@kilingzhang.com>
Date: Fri, 23 Mar 2018 17:37:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

解决冲突
---
 Resopnse.md | 73 -----------------------------------------------------
 1 file changed, 73 deletions(-)
 delete mode 100644 Resopnse.md

diff --git a/Resopnse.md b/Resopnse.md
deleted file mode 100644
index 2a4cef5..0000000
--- a/Resopnse.md
+++ /dev/null
@@ -1,73 +0,0 @@
-
-```
-[
-
-
-
-
-{
-    "retcode": 0,
-    "status": "ok",
-    "message": "同时 status 为 ok，表示操作成功",
-    "data": {
-        "app_enabled": true,
-        "app_initialized": true,
-        "good": true,
-        "http_service_good": true,
-        "online": true
-    }
-},
-{
-    "retcode": 0,
-    "status": "ok",
-    "message": "同时 status 为 ok，表示操作成功",
-    "data": {
-        "coolq_directory": "Z:\\home\\user\\coolq\\",
-        "coolq_edition": "air",
-        "plugin_build_configuration": "release",
-        "plugin_build_number": 323,
-        "plugin_version": "3.4.0"
-    }
-},
-{
-    "retcode": -2333,
-    "status": "failed",
-    "message": "CQHTTP插件未开启，或插件服务器启动失败。访问被拒绝。",
-    "data": []
-},
-{
-    "retcode": 1,
-    "status": "async",
-    "message": "同时 status 为 async，表示操作已进入异步执行，具体结果未知",
-    "data": null
-},
-{
-    "retcode": 0,
-    "status": "ok",
-    "message": "同时 status 为 ok，表示操作成功",
-    "data": null
-},
-{
-    "retcode": 0,
-    "status": "ok",
-    "message": "同时 status 为 ok，表示操作成功",
-    "data": [
-        {
-            "friend_group_id": 0,
-            "friend_group_name": "我的好友",
-            "friends": [
-                {
-                    "nickname": "babyQ",
-                    "remark": "babyQ",
-                    "user_id": 66600000
-                },
-                {
-                    "nickname": "~",
-                    "remark": "~",
-                    "user_id": 1353693508
-                }
-            ]
-        }
-    ]
-}
-]
\ No newline at end of file