Correction d'erreur de merge

Com_server/test/TestDroneRemoteControl.cpp

@@ -322,31 +322,21 @@ void signalHandler(int number)
    switch(number) 
    {
    case SIGINT :
-      printf("SIGINT caught\n"); //CTRL+C 
-<<<<<<< HEAD
+      printf("SIGINT caught\n"); //CTRL+C
       exit(0);
-=======
->>>>>>> 53a90fa35840947532eddd812b272932ee8fe7c6
       //TODO handle SIGINT reception situation
       break;
 
    case SIGTERM :
       printf("SIGTERM caught\n"); //kill (term command)
       //TODO handle SIGTERM reception situation
-<<<<<<< HEAD
       exit(0);
-=======
->>>>>>> 53a90fa35840947532eddd812b272932ee8fe7c6
       break;
 
    case SIGFPE :
       printf("SIGFPE caught\n"); //Floating-Point arithmetic Exception
       //TODO handle SIGFPE reception situation
       exit(0); //to prevent infinite loop
-<<<<<<< HEAD
-      
-=======
->>>>>>> 53a90fa35840947532eddd812b272932ee8fe7c6
       break;
 
    default :
@@ -365,11 +355,7 @@ int main(int argc, char *argv[])
 
    struct sigaction action;
    if(argc>1)  {strcpy(device_path ,argv[1]); printf("port = %s \n",device_path);}
-<<<<<<< HEAD
-  
-=======
    
->>>>>>> 53a90fa35840947532eddd812b272932ee8fe7c6
    //signal handler initialisation
    sigfillset(&action.sa_mask);
    action.sa_handler = signalHandler;
@@ -378,11 +364,7 @@ int main(int argc, char *argv[])
    //Make the list of all SIG to catch (will not be caught if not listed here, the list is not definitive and all are not necessarily usefull)
    if(sigaction(SIGINT, &action, NULL) != 0) printf("SIGINT couldn't be attached\n"); //ctrl+C
    if(sigaction(SIGTERM, &action, NULL) != 0) printf("SIGTERM couldn't be attached\n"); //kill [PID]
-<<<<<<< HEAD
    if(sigaction(SIGFPE, &action, NULL) != 0) printf("SIGFPE couldn't be attached\n"); //integer divided by 0 
-=======
-   if(sigaction(SIGFPE, &action, NULL) != 0) printf("SIGFPE couldn't be attached\n"); //integer divided by 0
->>>>>>> 53a90fa35840947532eddd812b272932ee8fe7c6
    drone1.open(device_path, device_baudrate);
 
     string buffer1="";