Permalink
Browse files

remove remnants of merge conflict

  • Loading branch information...
1 parent 69ecc40 commit 5f04c211a0aa80993d662a53d1aa3382fe432ecb @jtimberman jtimberman committed Jan 30, 2013
Showing with 0 additions and 4 deletions.
  1. +0 −4 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

0 comments on commit 5f04c21

Please sign in to comment.