submit some test

app/goahead-5.1.0/src/route.c

@@ -84,8 +84,6 @@ void personInfoAction(Webs *wp)
 }
 
 
-
-<<<<<<< HEAD
 /*获取设备信息*/
 void getDeviceInfo(Webs *wp){
     logmsg(2, "--------------------ggggggggg----------------");
@@ -174,8 +172,7 @@ void getDeviceInfoBak(Webs *wp){
 
 
 
-=======
->>>>>>> 62e2f54f0c6a6c4a634828a115139a52376334ba
+
 /************************************ Code ************************************/
 /*
     Route the request. If wp->route is already set, test routes after that route