Merge pull request #9 from drdla/patch-2

removed remainder of merge conflict
2012-08-27 11:21:10 -07:00 · 2012-08-27 11:21:10 -07:00 · 6cc34f9c16
commit 6cc34f9c16
parent b9b3210a73 57e82fcaa3
1 changed files with 1 additions and 1 deletions
--- 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,