[nama] 01/01: fix mismerge

[Damyan Ivanov]

This is an automated email from the git hooks/post-receive script.

dmn pushed a commit to branch master
in repository nama.

commit 7a60226948414f5deafebec7e3c5ddc0d913dce7
Author: Damyan Ivanov <dmn at debian.org>
Date:   Mon Oct 21 05:28:04 2013 +0000

    fix mismerge
    
    Git-Dch: ignore
---
 debian/control |    1 -
 1 file changed, 1 deletion(-)

diff --git a/debian/control b/debian/control
index d87ac27..a77a48c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,6 @@
 Source: nama
 Section: sound
 Priority: optional
-<<<<<<< HEAD
 Build-Depends: debhelper (>= 8)
 Build-Depends-Indep: libanyevent-perl (>= 5.0),
  libdata-dumper-concise-perl,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/nama.git