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)
commitcb52183c6a311d7413c286f73895b52a8e2e3a57
treeee6b071f31b39b4eedd2103d56fd2e8fdc86f270
parent7fe5bc8261d639753ee7a5a005ce06325231769b
parentc5486ccb9793029e58f0e6156d7d2f4d21de6cd0
Fix merge conflicts during merge of next and the suricata branch
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