fixing broken merge

Ronen Narkis · Ronen Narkis · commit f54031f84281 · 2013-10-08T15:42:12.000+03:00
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -61,15 +61,11 @@
   include stdlib
 
   class { 'nginx::package':
-<<<<<<< HEAD
     package_name   => $package_name,
     package_source => $package_source,
     package_ensure => $package_ensure,
-    notify => Class['nginx::service'],
-=======
     notify      => Class['nginx::service'],
     manage_repo => $manage_repo,
->>>>>>> b6ee1e59733eebaa410f7b4a18cc40c7c48be20e
   }
 
   class { 'nginx::config':
