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

Conflicts: manifests/package/redhat.pp
voxpupuli · Aug 28, 2012 · 721fb2f · 721fb2f
2 parents 08021c8 + 6cc34f9
commit 721fb2f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/manifests/package/redhat.pp b/manifests/package/redhat.pp
@@ -15,7 +15,7 @@
 # This class file is not called directly
 class nginx::package::redhat {
   $redhat_packages = ['nginx', 'GeoIP', 'gd', 'libXpm', 'libxslt']
-  
+
   $os_type = downcase($::operatingsystem)
 
   yumrepo { "nginx-release":

diff --git a/manifests/resource/location.pp b/manifests/resource/location.pp
@@ -25,7 +25,7 @@
 #    location => '/bob',
 #    vhost    => 'test2.local',
 #  }
-<<<<<<< HEAD
+
 define nginx::resource::location(
   $ensure             = present,
   $vhost              = undef,