Merge pull request #154 from narkisr/master

Fixing broken merge

manifests/init.pp

@@ -61,15 +61,11 @@ class nginx (
   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':

manifests/package.pp

@@ -67,5 +67,4 @@ class nginx::package(
       }
     }
   }
-        manage_repo => $manage_repo,
 }