Merge pull request #9 from drdla/patch-2

removed remainder of merge conflict
voxpupuli · Aug 27, 2012 · 6cc34f9 · 6cc34f9
2 parents b9b3210 + 57e82fc
commit 6cc34f9
Showing 1 changed file with 1 addition and 1 deletion.
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,