fix up merge conflicts to compile on strict settings
[systembsd.git] / src /
drwxr-xr-x   ..
-rw-r--r-- 5859 config.c
drwxr-xr-x - interfaces
-rw-r--r-- 1810 main.c
-rw-r--r-- 1378 main.h