[wesnoth] 01/01: fix uncaught merge conflict

[Vincent Cheng]

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

vcheng pushed a commit to branch wheezy-backports-sloppy
in repository wesnoth.

commit 3588b3f8fa315c960d6619e5a3d14fc049f1e3a1
Author: Vincent Cheng <vcheng at debian.org>
Date:   Mon May 23 16:06:17 2016 -0700

    fix uncaught merge conflict
---
 debian/control    | 5 -----
 debian/control.in | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/debian/control b/debian/control
index 15b0a98..eb2333b 100644
--- a/debian/control
+++ b/debian/control
@@ -18,12 +18,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/wesnoth.git
 
 Package: wesnoth-1.12-data
 Architecture: all
-<<<<<<< HEAD
 Depends: ${misc:Depends}, ttf-dejavu-core
-Recommends: fonts-droid
-=======
-Depends: ${misc:Depends}, fonts-dejavu-core
->>>>>>> master
 Suggests: wesnoth-1.12-music
 Description: data files for Wesnoth (branch 1.12)
  This package contains the sound files and graphics for Wesnoth. It is required
diff --git a/debian/control.in b/debian/control.in
index 4d60ac2..6f02ee7 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -18,12 +18,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/wesnoth.git
 
 Package: wesnoth-BRANCH-data
 Architecture: all
-<<<<<<< HEAD
 Depends: ${misc:Depends}, ttf-dejavu-core
-Recommends: fonts-droid
-=======
-Depends: ${misc:Depends}, fonts-dejavu-core
->>>>>>> master
 Suggests: wesnoth-BRANCH-music
 Description: data files for Wesnoth (branch BRANCH)
  This package contains the sound files and graphics for Wesnoth. It is required

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/wesnoth.git