opuppet/module-nginx
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixing broken merge

Browse source
This commit is contained in:
Ronen Narkis 2013-10-08 15:42:12 +03:00
parent 7ea6b570c3
commit f54031f842
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
manifests/init.pp
View file

@ -61,15 +61,11 @@ class nginx (
include stdlib include stdlib
class { 'nginx::package': class { 'nginx::package':
<<<<<<< HEAD
package_name => $package_name, package_name => $package_name,
package_source => $package_source, package_source => $package_source,
package_ensure => $package_ensure, package_ensure => $package_ensure,
notify => Class['nginx::service'], notify => Class['nginx::service'],
=======
notify => Class['nginx::service'],
manage_repo => $manage_repo, manage_repo => $manage_repo,
>>>>>>> b6ee1e59733eebaa410f7b4a18cc40c7c48be20e
} }
class { 'nginx::config': class { 'nginx::config':