From 15b093d3f6f30eff1003699b7d4da65a042c6ea1 Mon Sep 17 00:00:00 2001
From: aixiao <aixiao@aixiao.me>
Date: Sat, 8 Oct 2022 14:39:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 conf.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/conf.c b/conf.c
index e25efca..88fc141 100644
--- a/conf.c
+++ b/conf.c
@@ -212,7 +212,6 @@ void read_conf(char *filename, conf * configure)
 
 void free_conf(conf * conf)
 {
-<<<<<<< HEAD
     if (conf->DAEMON)
         free(conf->DAEMON);
     if (conf->PHONE)
@@ -228,15 +227,6 @@ void free_conf(conf * conf)
     if (conf->PUBLIC_IP)
         free(conf->PUBLIC_IP);
     
-=======
-    free(conf->DAEMON);
-    free(conf->PHONE);
-    free(conf->DING_WEBHOOK);
-    free(conf->SEND_QQ);
-    free(conf->QQMAIL_KEY);
-    free(conf->RECV_MAIL);
-
->>>>>>> 969927106ef9eb03564fd5e1501260cc1b957d4a
     return;
 }