opscode-cookbooks/nginx — pull request #196 by modocache (2014-02-28 07:56:36+00:00)
Title: Remove Git merge artifacts from default.rb

Pointed out by @sotarok: https://twitter.com/sotarok/status/439290802204721152