diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2015-12-03 13:49:28 +0100 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2015-12-03 13:49:39 +0100 |
| commit | 7f5e120c432b5fa3a02e5b2ec8c82a38ed5272ba (patch) | |
| tree | 0f39ff3d6cb7c67342ee510ae23c7fead77fcd0f /dev-tex | |
| parent | net-misc/owncloud-client: version bump, add dolphin plugin support (diff) | |
| download | gentoo-7f5e120c432b5fa3a02e5b2ec8c82a38ed5272ba.tar.gz gentoo-7f5e120c432b5fa3a02e5b2ec8c82a38ed5272ba.tar.bz2 gentoo-7f5e120c432b5fa3a02e5b2ec8c82a38ed5272ba.zip | |
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>
Diffstat (limited to 'dev-tex')
| -rw-r--r-- | dev-tex/minted/minted-1.7.ebuild | 4 | ||||
| -rw-r--r-- | dev-tex/minted/minted-2.0.ebuild | 4 |
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 3e4ed32b5aff..0331cbaed825 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 a72ed111d8af..07ed452c0c3b 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" |