cmhi
/
vcpe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OCT 1. 手动修改合并代码

This commit is contained in:
huangxin 2022-12-07 16:03:02 +08:00
parent 3790f66ace
commit 00da37446d
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
srcs/open_dhcp/query.cpp
View File

@ -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;
}
}