From 766d5b7dcc8701f296bc79261aed4967b9d8cb40 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 25 May 2017 16:33:09 -0400 Subject: [PATCH] fix merge --- distros/ubuntu1604/control | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/distros/ubuntu1604/control b/distros/ubuntu1604/control index a860ce6f5..95a8150a4 100644 --- a/distros/ubuntu1604/control +++ b/distros/ubuntu1604/control @@ -5,24 +5,18 @@ 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 ,libgnutls-openssl-dev - , libjpeg8-dev | libjpeg9-dev | libjpeg62-turbo-dev + ,libjpeg8-dev | libjpeg9-dev | libjpeg62-turbo-dev ,libmysqlclient-dev ,libpcre3-dev ,libpolkit-gobject-1-dev