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 /Library | |
| 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>
Diffstat (limited to 'Library')
0 files changed, 0 insertions, 0 deletions