summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-tex/minted')
-rw-r--r--dev-tex/minted/minted-1.7.ebuild4
-rw-r--r--dev-tex/minted/minted-2.0.ebuild4
2 files changed, 8 insertions, 0 deletions
diff --git a/dev-tex/minted/minted-1.7.ebuild b/dev-tex/minted/minted-1.7.ebuild
index 0331cbaed825..3e4ed32b5aff 100644
--- a/dev-tex/minted/minted-1.7.ebuild
+++ b/dev-tex/minted/minted-1.7.ebuild
@@ -6,7 +6,11 @@ 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 07ed452c0c3b..a72ed111d8af 100644
--- a/dev-tex/minted/minted-2.0.ebuild
+++ b/dev-tex/minted/minted-2.0.ebuild
@@ -6,7 +6,11 @@ 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"