Merge branch 'master' of github.com:jfryman/puppet-nginx

Conflicts: README.markdown manifests/resource/location.pp
2012-08-27 09:29:46 -05:00 · 2012-08-27 09:29:46 -05:00 · 4d02012150
commit 4d02012150
parent 49cc046ac8 df8a1b5059
2 changed files with 1 additions and 1 deletions
--- a/README.markdown
+++ b/README.markdown
@ -27,7 +27,6 @@ Setup a new virtual host
 </pre>

 Add a Proxy Server(s)
-
 <pre>
   node default {
     class { 'mcollective': }
--- a/manifests/resource/location.pp
+++ b/manifests/resource/location.pp
@ -25,6 +25,7 @@
 #    location => '/bob',
 #    vhost    => 'test2.local',
 #  }
+<<<<<<< HEAD
 define nginx::resource::location(
  $ensure             = present,
  $vhost              = undef,