jackl0phty/opschef-cookbook-avahi-daemon — pull request #7 by githubnemo (2014-08-11 12:15:50+00:00)
Title: Remove merge conflict markup

Resolves issue #6