| 1 |
commit: 7f5e120c432b5fa3a02e5b2ec8c82a38ed5272ba |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 3 12:49:28 2015 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 3 12:49:39 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f5e120c |
| 7 |
|
| 8 |
dev-tex/minted: Fix bad merge |
| 9 |
|
| 10 |
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=567448 |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.25 |
| 13 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-tex/minted/minted-1.7.ebuild | 4 ---- |
| 16 |
dev-tex/minted/minted-2.0.ebuild | 4 ---- |
| 17 |
2 files changed, 8 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-tex/minted/minted-1.7.ebuild b/dev-tex/minted/minted-1.7.ebuild |
| 20 |
index 3e4ed32..0331cba 100644 |
| 21 |
--- a/dev-tex/minted/minted-1.7.ebuild |
| 22 |
+++ b/dev-tex/minted/minted-1.7.ebuild |
| 23 |
@@ -6,11 +6,7 @@ EAPI=5 |
| 24 |
|
| 25 |
inherit latex-package |
| 26 |
|
| 27 |
-<<<<<<< 1b4109b06fe34ac39f3fc55996d66a9b6cc8d809 |
| 28 |
DESCRIPTION="LaTeX package for source code syntax highlighting" |
| 29 |
-======= |
| 30 |
-DESCRIPTION="Expressive syntax highlighting in using the powerful Pygments library" |
| 31 |
->>>>>>> dev-tex/minted: Chop DESCRIPTION to 80 chars |
| 32 |
HOMEPAGE="https://code.google.com/p/minted/" |
| 33 |
SRC_URI="https://minted.googlecode.com/files/${PN}-v${PV}.zip" |
| 34 |
|
| 35 |
|
| 36 |
diff --git a/dev-tex/minted/minted-2.0.ebuild b/dev-tex/minted/minted-2.0.ebuild |
| 37 |
index a72ed11..07ed452 100644 |
| 38 |
--- a/dev-tex/minted/minted-2.0.ebuild |
| 39 |
+++ b/dev-tex/minted/minted-2.0.ebuild |
| 40 |
@@ -6,11 +6,7 @@ EAPI=5 |
| 41 |
|
| 42 |
inherit latex-package |
| 43 |
|
| 44 |
-<<<<<<< 1b4109b06fe34ac39f3fc55996d66a9b6cc8d809 |
| 45 |
DESCRIPTION="LaTeX package for source code syntax highlighting" |
| 46 |
-======= |
| 47 |
-DESCRIPTION="Expressive syntax highlighting in using the powerful Pygments library" |
| 48 |
->>>>>>> dev-tex/minted: Chop DESCRIPTION to 80 chars |
| 49 |
HOMEPAGE="https://github.com/gpoore/minted" |
| 50 |
SRC_URI="https://github.com/gpoore/minted/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
Archives