Merge branch 'master' into openstreetbugs

[rails.git] / config / mongrel_cluster.yml

diff --git a/config/mongrel_cluster.yml b/config/mongrel_cluster.yml
index 954be24af1d8786f9dc275c9e61fc9ecb6ce0875..d6c477b9a47c41c75ea87f63ad35fb3e8c2e3a57 100644 (file)
--- a/config/mongrel_cluster.yml
+++ b/config/mongrel_cluster.yml
@@ -1,5 +1,5 @@
----\r
-log_file: log/mongrel.log\r
-port: 8000\r
-pid_file: tmp/mongrel.pid\r
+---
+log_file: log/mongrel.log
+port: 8000
+pid_file: tmp/mongrel.pid
 servers: 8
\ No newline at end of file