[sr-dev] git:3.1: I hate git

[Jon Bonilla]

Module: sip-router
Branch: 3.1
Commit: 47405259234989b0c7ce53091ba4cdad280586c5
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=47405259234989b0c7ce53091ba4cdad280586c5

Author: Jon Bonilla <manwe at aholab.ehu.es>
Committer: Jon Bonilla <manwe at aholab.ehu.es>
Date:   Sun Oct 10 01:40:22 2010 +0200

I hate git

---

 pkg/kamailio/debian/control |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

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 <manwe at aholab.ehu.es>
-<<<<<<< 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/