From 8f468df79cbb5b15caf353490f72883d44be5491 Mon Sep 17 00:00:00 2001
From: maqian <maqian@threatbook.cn>
Date: Wed, 4 Aug 2021 19:34:04 +0800
Subject: [PATCH] xiugai

---
 docs/_sidebar.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/_sidebar.md b/docs/_sidebar.md
index 3c21077..5ef7d86 100644
--- a/docs/_sidebar.md
+++ b/docs/_sidebar.md
@@ -23,11 +23,7 @@
   - [情报对接](6-1-intel)
   - [通知配置](6-2-message)
   - [告警策略](6-3-alarm)
-<<<<<<< HEAD
     - [钉钉告警配置方式](6-2-1dingtalk)
-=======
-    - [钉钉告警配置](6-2-1dingtalk)
->>>>>>> d037af8d861e44b1cd013c5f68e81da352b68fad
   - [API配置](6-4-api)
 - 平台管理
   - [登录管理](7-1-login)