summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-tex/minted/minted-1.7.ebuild4
-rw-r--r--dev-tex/minted/minted-2.0.ebuild4
2 files changed, 0 insertions, 8 deletions
diff --git a/dev-tex/minted/minted-1.7.ebuild b/dev-tex/minted/minted-1.7.ebuild
index 3e4ed32b5af..0331cbaed82 100644
--- 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 a72ed111d8a..07ed452c0c3 100644
--- 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"