From: Stefan Schantl Date: Thu, 23 Aug 2018 08:34:17 +0000 (+0200) Subject: Fix merge conflicts during merge of next and the suricata branch X-Git-Tag: v2.23-core131~117^2~173 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=cb52183c6a311d7413c286f73895b52a8e2e3a57 Fix merge conflicts during merge of next and the suricata branch --- cb52183c6a311d7413c286f73895b52a8e2e3a57