jfryman/puppet-nginx — pull request #154 by narkisr (2013-10-08 16:38:31+00:00)
Title: Fixing broken merge

Hey,

It looks like a merge was committed with the conflict comments in place

Thanks