resolve merge

app/goahead-5.1.0/build/linux-arm-static/inc/goahead.h

@@ -3986,6 +3986,10 @@ PUBLIC void websRemoveSessionVar(Webs *wp, cchar *name);
  */
 PUBLIC int websSetSessionVar(Webs *wp, cchar *name, cchar *value);
 
+
+//add by lusa
+PUBLIC void personInfoAction(Webs *wp);
+
 /************************************ Legacy **********************************/
 /*
     Legacy mappings for pre GoAhead 3.X applications
@@ -4173,6 +4177,8 @@ PUBLIC int websSetSessionVar(Webs *wp, cchar *name, cchar *value);
  #include "customize.h"
 #endif
 
+
+
 #ifdef __cplusplus
 }
 #endif

app/goahead-5.1.0/src/goahead.c

@@ -42,7 +42,6 @@ static LRESULT CALLBACK websWindProc(HWND hwnd, UINT msg, UINT wp, LPARAM lp);
 static void sigHandler(int signo);
 #endif
 
-<<<<<<< HEAD
 /*********************************** Code *************************************/
 
 MAIN(goahead, int argc, char **argv, char **envp)
@@ -54,8 +53,8 @@ MAIN(goahead, int argc, char **argv, char **envp)
     auth = "auth.txt";
 
 
-static void buy(Webs *wp);
-static void actionTest(Webs *wp);
+//static void buy(Webs *wp);
+//static void actionTest(Webs *wp);
 // static void personInfoAction(Webs *wp);