From 00da37446d3800e3d432f7a9ca2068f01e932652 Mon Sep 17 00:00:00 2001 From: huangxin Date: Wed, 7 Dec 2022 16:03:02 +0800 Subject: [PATCH] =?UTF-8?q?OCT=201.=20=E6=89=8B=E5=8A=A8=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- srcs/open_dhcp/query.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/srcs/open_dhcp/query.cpp b/srcs/open_dhcp/query.cpp index ad3e8ab..0bb508f 100644 --- a/srcs/open_dhcp/query.cpp +++ b/srcs/open_dhcp/query.cpp @@ -861,12 +861,8 @@ void opendhcp_init_http_server() { hw_http_add_route("/", opendhcp_http_info, nullptr); hw_http_add_route("dhcp/info/getuser", opendhcp_http_get_userinfo, nullptr); hw_http_add_route("dhcp/info/allusers", opendhcp_http_get_alluser, nullptr); -<<<<<<< HEAD - hw_http_add_route("dhcp/config/rangeset", opendhcp_http_expand_rangeset, nullptr); -======= hw_http_add_route("dhcp/config/rangeset", opendhcp_http_add_rangeset, nullptr); hw_http_add_route("dhcp/delete/rangeset", opendhcp_http_delete_rangeset, nullptr); ->>>>>>> origin/master added = TRUE; } } \ No newline at end of file