fix merge conflict

Author: Daniel Schaaff

manifests/master.pp

@@ -160,10 +160,7 @@
     passenger_max_requests        => $passenger_max_requests,
     passenger_stat_throttle_rate  => $passenger_stat_throttle_rate,
     passenger_root                => $passenger_root,
-<<<<<<< HEAD
-=======
     passenger_disable_mod_status  => $passenger_disable_mod_status,
->>>>>>> ac41fc3fa574aff597dfb850595fefad4778ad56
   } ->
   Anchor['puppet::master::end']
 
@@ -389,4 +386,4 @@
     }
   }
   anchor { 'puppet::master::end': }
-}
+}