remove remnants of merge conflict

sous-chefs · Jan 30, 2013 · 5f04c21 · 5f04c21
1 parent 69ecc40
commit 5f04c21
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/templates/default/passenger.load.erb b/templates/default/passenger.load.erb
@@ -1,5 +1 @@
-<<<<<<< HEAD
-LoadModule passenger_module <%= node[:passenger][:module_path] %>
-=======
 LoadModule passenger_module <%= node['passenger']['module_path'] %>
->>>>>>> convert symbols to strings. normalize single vs double quotes