[DRE-commits] [shelr] 05/09: fix error

[Takaki Taniguchi]

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

takaki pushed a commit to branch master
in repository shelr.

commit 5a9bb58818551730ade43621379ded70773f49eb
Author: TANIGUCHI Takaki <takaki at asis.media-as.org>
Date:   Tue Jul 4 17:22:07 2017 +0900

    fix error
---
 debian/control | 1 -
 1 file changed, 1 deletion(-)

diff --git a/debian/control b/debian/control
index eb1a63c..1371105 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,6 @@ Build-Depends: bash-completion,
 Standards-Version: 3.9.7
 Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/shelr.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/shelr.git
->>>>>>> cb0681db1ae4ed4a58e52b9e771596e4a5dc29ac
 Homepage: http://shelr.tv/
 XS-Ruby-Versions: all
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/shelr.git