From f54031f8428154028bc9a311f5fa332e89c9cd25 Mon Sep 17 00:00:00 2001 From: Ronen Narkis Date: Tue, 8 Oct 2013 15:42:12 +0300 Subject: [PATCH] fixing broken merge --- manifests/init.pp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index b976f08..341009e 100644 --- a/manifests/init.pp +++ b/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':