solved conflicts for fun and profit

2013-11-02 22:32:21 +01:00 · 2013-11-02 22:32:21 +01:00 · e6b2657e89
commit e6b2657e89
parent aeabe2ed3c
1 changed files with 2 additions and 0 deletions
--- a/src/main.c
+++ b/src/main.c
@ -1,8 +1,10 @@
 #include <stdio.h>
+#include <signal.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>

+
 #include "misc.h"
 #include "net.h"
 #include "display.h"