Merge "scapy: Fix conflict of scapy libraries"
authorMartin Klozik <martinx.klozik@intel.com>
Tue, 3 Apr 2018 07:17:42 +0000 (07:17 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 3 Apr 2018 07:17:42 +0000 (07:17 +0000)

Trivial merge