Robert Eshleman 6d1959b265 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>

2015-12-09 15:31:02 +00:00

..

homebrew

Remove Git Conflict Markers in Documentation

2015-12-09 15:31:02 +00:00