s449323/ZSIK_Projekt
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove conflict

Browse Source
This commit is contained in:
Mateusz Kowalczyk 2019-12-14 11:42:46 +01:00
parent 3ed6be55e8
commit bc0aa22a24
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/serverv2.c
View File

@ -76,19 +76,10 @@ int main(int argc, char **argv)
} }
free(namelist); free(namelist);
<<<<<<< HEAD
if(s = send(sdconnection, names_files, 512, 0) == 512){ if(s = send(sdconnection, names_files, 512, 0) == 512){
printf("eejo\n"); printf("Done Sending\n");
goto start; goto start;
} }
=======
send(sdconnection, names_files, 512, 0);
printf("Done Sending");
goto start;
>>>>>>> d2be62bb14d7513dfd23f9559a93e3de040781a0
} }
else if (strncmp("SEND", buff, 4) == 0) else if (strncmp("SEND", buff, 4) == 0)
{ {