Fix merge conflicts during merge of next and the suricata branch
authorStefan Schantl <stefan.schantl@ipfire.org>
Thu, 23 Aug 2018 08:34:17 +0000 (10:34 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Thu, 23 Aug 2018 08:34:17 +0000 (10:34 +0200)
1  2 
config/rootfiles/common/aarch64/initscripts
config/rootfiles/common/armv5tel/initscripts
config/rootfiles/common/i586/initscripts
config/rootfiles/common/x86_64/initscripts
lfs/initscripts
make.sh

diff --cc lfs/initscripts
Simple merge
diff --cc make.sh
Simple merge