Fix merge conflict introduced when backporting the original commit 253e4dc0683b ("conntrack: fix tcp seq adjustments when mangling commands.")
Fixes: addbb52274ae ("conntrack: fix tcp seq adjustments when mangling commands.") Signed-off-by: David Marchand <david.march...@redhat.com> --- Vagrantfile | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index d7e38a1..fbd772a 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -21,17 +21,6 @@ $bootstrap_debian = <<SCRIPT aptitude -y update aptitude -y upgrade aptitude -y install -R \ -<<<<<<< HEAD - build-essential dpkg-dev lintian devscripts fakeroot \ - debhelper dh-autoreconf uuid-runtime \ - autoconf automake libtool \ - python-all python-twisted-core python-twisted-conch \ - xdg-utils groff graphviz netcat curl \ - wget python-six ethtool \ - libcap-ng-dev libssl-dev python-dev openssl \ - python-pyftpdlib python-flake8 python-tftpy \ - linux-headers-`uname -r` -======= build-essential dpkg-dev lintian devscripts fakeroot \ debhelper dh-autoreconf uuid-runtime \ autoconf automake libtool \ @@ -42,7 +31,6 @@ aptitude -y install -R \ python-pyftpdlib python-flake8 python-tftpy \ linux-headers-`uname -r` \ lftp ->>>>>>> conntrack: fix tcp seq adjustments when mangling commands. SCRIPT $bootstrap_centos = <<SCRIPT -- 1.8.3.1 _______________________________________________ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev