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

Merge pull request #9 from drdla/patch-2

Browse source 
removed remainder of merge conflict
This commit is contained in:
James Fryman 2012-08-27 11:21:10 -07:00
commit 6cc34f9c16
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
manifests/resource/location.pp
View file

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