submit ome bug

app/goahead-3.6.5/src/file.c

@@ -197,11 +197,7 @@ PUBLIC void websFileOpen()
  */
 PUBLIC char *websGetIndex()
 {
-<<<<<<< HEAD
-    printf(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>fffffffff\n");
-=======
     printf(">>>>>>>>>>>>>>>>>>>>>>>>is here ???>>>>>>>>>>>>>>>>>>>>>>");
->>>>>>> fe4d89ee47c744807bfc2080af8bda8c76a62aea
     return websIndex;
 }