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>

diff --git a/dev-tex/minted/minted-1.7.ebuild b/dev-tex/minted/minted-1.7.ebuild
index 3e4ed32b5affac16252162de8be244574d3e1bb5..0331cbaed82546b1215f0345bfa8ee4c67587163 100644 (file)
--- a/dev-tex/minted/minted-1.7.ebuild
+++ b/dev-tex/minted/minted-1.7.ebuild
@@ -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"
 

diff --git a/dev-tex/minted/minted-2.0.ebuild b/dev-tex/minted/minted-2.0.ebuild
index a72ed111d8af742f138a3d997b3a0f3dfe89fefd..07ed452c0c3b9c81bea7c2c92430a69e67d9e8d3 100644 (file)
--- a/dev-tex/minted/minted-2.0.ebuild
+++ b/dev-tex/minted/minted-2.0.ebuild
@@ -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"