diff options
| author | Robert Eshleman | 2015-12-09 10:22:53 -0500 |
|---|---|---|
| committer | Mike McQuaid | 2015-12-09 15:31:02 +0000 |
| commit | 6d1959b265d8ccee81bd32f59bb71b71b070a06a (patch) | |
| tree | e8ae89e9cca3963b2bbf0bbc045d94915e895268 | |
| parent | 48b39ba1e7c6088ced269420617ad440bf7d5605 (diff) | |
| download | brew-6d1959b265d8ccee81bd32f59bb71b71b070a06a.tar.bz2 | |
Remove Git Conflict Markers in Documentation
`Formula-Cookbook.md` contains leftover git conflict markers introduced
in 15f291ddaa05cc010456a733b799382175c29dd4.
This commit removes the conflict makers and a duplicated paragraph.
Closes Homebrew/homebrew#46836.
Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
| -rw-r--r-- | share/doc/homebrew/Formula-Cookbook.md | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/share/doc/homebrew/Formula-Cookbook.md b/share/doc/homebrew/Formula-Cookbook.md index df9d1077e..cd48cabab 100644 --- a/share/doc/homebrew/Formula-Cookbook.md +++ b/share/doc/homebrew/Formula-Cookbook.md @@ -755,8 +755,7 @@ For example, Ruby 1.9’s gems should be installed to `var/lib/ruby/` so that ge ### launchd plist files -<<<<<<< 12f42a6761cb29ed3c9715fe2cbccff02bdc448f -Homebrew provides two Formula methods for launchd plist files. `plist_name` will return `homebrew.mxcl.<formula>`, and `plist_path` will return, for example, `/usr/local/Cellar/foo/0.1/homebrew.mxcl.foo.plist`. +Homebrew provides two Formula methods for launchd plist files. [`plist_name`](http://www.rubydoc.info/github/Homebrew/homebrew/master/Formula#plist_name-instance_method) will return e.g. `homebrew.mxcl.<formula>` and [`plist_path`](http://www.rubydoc.info/github/Homebrew/homebrew/master/Formula#plist_path-instance_method) will return e.g. `/usr/local/Cellar/foo/0.1/homebrew.mxcl.foo.plist`. ## Updating formulae @@ -773,11 +772,6 @@ Homebrew wants to maintain a consistent Ruby style across all formulae based on * The order of methods in a formula should be consistent with other formulae (e.g.: `def patches` goes before `def install`) * An empty line is required before the `__END__` line - -======= -Homebrew provides two Formula methods for launchd plist files. [`plist_name`](http://www.rubydoc.info/github/Homebrew/homebrew/master/Formula#plist_name-instance_method) will return e.g. `homebrew.mxcl.<formula>` and [`plist_path`](http://www.rubydoc.info/github/Homebrew/homebrew/master/Formula#plist_path-instance_method) will return e.g. `/usr/local/Cellar/foo/0.1/homebrew.mxcl.foo.plist`. ->>>>>>> Overhaul, simplify and cleanup documentation. - # Troubleshooting for people writing new formulae ### Version detection fails |