diff options
| author | Tim D. Smith | 2015-03-23 17:49:05 -0700 |
|---|---|---|
| committer | Tim D. Smith | 2015-03-23 17:49:05 -0700 |
| commit | c09f54afb98dea37798d5e47b48c4b5160ba41b5 (patch) | |
| tree | c51b653be3bac4ec185c60c84bb0aff10953f1e1 /Library/Formula | |
| parent | 618431d29986c66a0231b5fe2a5f9565722b4f91 (diff) | |
| download | homebrew-c09f54afb98dea37798d5e47b48c4b5160ba41b5.tar.bz2 | |
unswap markdown conflicts_withs
Follow-up to 97bc7722426583e2def573b1242d517914b0ea40.
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/markdown.rb | 2 | ||||
| -rw-r--r-- | Library/Formula/multimarkdown.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Library/Formula/markdown.rb b/Library/Formula/markdown.rb index 69eb4fa54..b9b4eb8b2 100644 --- a/Library/Formula/markdown.rb +++ b/Library/Formula/markdown.rb @@ -7,7 +7,7 @@ class Markdown < Formula conflicts_with 'discount', :because => 'both markdown and discount ship a `markdown` executable.' - conflicts_with 'markdown', :because => 'both install `markdown` binaries' + conflicts_with 'multimarkdown', :because => 'both install `markdown` binaries' def install bin.install 'Markdown.pl' => 'markdown' diff --git a/Library/Formula/multimarkdown.rb b/Library/Formula/multimarkdown.rb index 0c370741d..7cb7a953b 100644 --- a/Library/Formula/multimarkdown.rb +++ b/Library/Formula/multimarkdown.rb @@ -15,7 +15,7 @@ class Multimarkdown < Formula end conflicts_with 'mtools', :because => 'both install `mmd` binaries' - conflicts_with 'multimarkdown', :because => 'both install `markdown` binaries' + conflicts_with 'markdown', :because => 'both install `markdown` binaries' def install ENV.append 'CFLAGS', '-g -O3 -include GLibFacade.h' |