Merge pull request #154 from narkisr/master

Fixing broken merge
voxpupuli · Oct 8, 2013 · 8989d56 · 8989d56
2 parents 7ea6b57 + a54f7ad
commit 8989d56
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 5 deletions.
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':

diff --git a/manifests/package.pp b/manifests/package.pp
@@ -67,5 +67,4 @@
       }
     }
   }
-        manage_repo => $manage_repo,
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -67,5 +67,4 @@ @@
           }
         }
       }
-            manage_repo => $manage_repo,
     }