This is a test of the new merge script

git-svn-id: file:///home/svn/framework3/trunk@4654 4d416f70-5f16-0410-b530-b9f4589650da
2007-04-05 05:08:21 +00:00 · 2007-04-05 05:08:21 +00:00 · 47a5303ca4
parent 4d3a91f63b
commit 47a5303ca4
1 changed files with 2 additions and 0 deletions
--- a/data/msfweb/config/environment.rb
+++ b/data/msfweb/config/environment.rb
@ -1,4 +1,6 @@
+#
 # Force the application into production mode
+#
 ENV['RAILS_ENV'] = 'production'