[sr-dev] git:master: Still hating git

Module: sip-router Branch: master Commit: 2e5310e5f7c3e1f4307b052c582800b508f95784 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2e5310e… Author: Jon Bonilla &lt;manwe(a)aholab.ehu.es&gt; Committer: Jon Bonilla &lt;manwe(a)aholab.ehu.es&gt; Date: Sun Oct 10 01:41:12 2010 +0200 Still hating git --- pkg/kamailio/debian-squeeze/control | 4 ---- pkg/kamailio/debian/control | 4 ---- 2 files changed, 0 insertions(+), 8 deletions(-) diff --git a/pkg/kamailio/debian-squeeze/control b/pkg/kamailio/debian-squeeze/control index 00aaf9a..ab4ad1e 100644 --- a/pkg/kamailio/debian-squeeze/control +++ b/pkg/kamailio/debian-squeeze/control @@ -2,11 +2,7 @@ Source: kamailio Section: net Priority: optional Maintainer: Jon Bonilla &lt;manwe(a)aholab.ehu.es&gt; -<<<<<<< HEAD Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libgeoip-dev, libmemcache-dev, libreadline-dev, liblua5.1-0-dev, python-dev, libsasl2-dev -======= -Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libmemcache-dev, libreadline-dev ->>>>>>> b532368... pkg debian Standards-Version: 3.8.0 Homepage: http://www.kamailio.org/ diff --git a/pkg/kamailio/debian/control b/pkg/kamailio/debian/control index c7b6fa2..73a1e26 100644 --- a/pkg/kamailio/debian/control +++ b/pkg/kamailio/debian/control @@ -2,11 +2,7 @@ Source: kamailio Section: net Priority: optional Maintainer: Jon Bonilla &lt;manwe(a)aholab.ehu.es&gt; -<<<<<<< HEAD Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libpurple-dev, libmemcache-dev, libreadline-dev, liblua5.1-0-dev, python-dev, libsasl2-dev -======= -Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libpurple-dev, libmemcache-dev, libreadline-dev ->>>>>>> b532368... pkg debian Standards-Version: 3.8.0 Homepage: http://www.kamailio.org/