swcarpentry/website — pull request #74 by gvwilson (2012-12-14 17:34:26+00:00)
Title: Removing conflict markers inherited from SVN by accident.

The boot camp FAQ had some SVN conflict markers in it, which tripped up the web site compiler.