dev-tex/minted: Fix bad merge

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=567448

Package-Manager: portage-2.2.25
Signed-off-by: Justin Lecher <jlec@gentoo.org>
This commit is contained in:
Justin Lecher
2015-12-03 13:49:28 +01:00
parent 258b51205b
commit 7f5e120c43
2 changed files with 0 additions and 8 deletions

View File

@@ -6,11 +6,7 @@ EAPI=5
inherit latex-package
<<<<<<< 1b4109b06fe34ac39f3fc55996d66a9b6cc8d809
DESCRIPTION="LaTeX package for source code syntax highlighting"
=======
DESCRIPTION="Expressive syntax highlighting in using the powerful Pygments library"
>>>>>>> dev-tex/minted: Chop DESCRIPTION to 80 chars
HOMEPAGE="https://code.google.com/p/minted/"
SRC_URI="https://minted.googlecode.com/files/${PN}-v${PV}.zip"

View File

@@ -6,11 +6,7 @@ EAPI=5
inherit latex-package
<<<<<<< 1b4109b06fe34ac39f3fc55996d66a9b6cc8d809
DESCRIPTION="LaTeX package for source code syntax highlighting"
=======
DESCRIPTION="Expressive syntax highlighting in using the powerful Pygments library"
>>>>>>> dev-tex/minted: Chop DESCRIPTION to 80 chars
HOMEPAGE="https://github.com/gpoore/minted"
SRC_URI="https://github.com/gpoore/minted/archive/v${PV}.tar.gz -> ${P}.tar.gz"