From cbb3903e5e909c51e5b3598064011635c2c3c5d3 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 26 May 2017 22:24:02 -0400 Subject: [PATCH] fix merge --- distros/ubuntu1604/control | 6 ------ 1 file changed, 6 deletions(-) diff --git a/distros/ubuntu1604/control b/distros/ubuntu1604/control index a860ce6f5..1cda8b341 100644 --- a/distros/ubuntu1604/control +++ b/distros/ubuntu1604/control @@ -5,19 +5,13 @@ Maintainer: Dmitry Smirnov Uploaders: Vagrant Cascadian Build-Depends: debhelper (>= 9), dh-systemd, python-sphinx | python3-sphinx, apache2-dev, dh-linktree ,cmake -<<<<<<< HEAD ,libx264-dev, libmp4v2-dev - ,libavcodec-dev, libavformat-dev, libswscale-dev - ,libavutil-dev, libavdevice-dev, libavresample-dev - ,libboost-dev -======= ,libboost-dev ,libavdevice-dev (>= 6:10~) ,libavcodec-dev (>= 6:10~) ,libavformat-dev (>= 6:10~) ,libavutil-dev (>= 6:10~) ,libswscale-dev (>= 6:10~) ->>>>>>> dragndrop_monitor_sorting ,libbz2-dev ,libgcrypt-dev ,libcurl4-gnutls-dev