diff options
| author | José Valim <jose.valim@gmail.com> | 2009-07-21 12:51:53 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-07-21 12:51:53 +0200 |
| commit | 33048b6e2738ff73b612dbcb35955189221dfbd0 (patch) | |
| tree | 7e32f6031199c1e7ee9a3e5a15789b5f568a565d /railties/lib/generators/rails/app/templates/script/performance/benchmarker.tt | |
| parent | edda0bfe76fc9b2adcdb705665aaef2769e6ef03 (diff) | |
| parent | 9d7aae710384fb5f04129c35b86c5ea5fb9d83a9 (diff) | |
| download | rails-33048b6e2738ff73b612dbcb35955189221dfbd0.tar.gz rails-33048b6e2738ff73b612dbcb35955189221dfbd0.tar.bz2 rails-33048b6e2738ff73b612dbcb35955189221dfbd0.zip | |
Solving merge conflicts.
Diffstat (limited to 'railties/lib/generators/rails/app/templates/script/performance/benchmarker.tt')
| -rwxr-xr-x | railties/lib/generators/rails/app/templates/script/performance/benchmarker.tt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/generators/rails/app/templates/script/performance/benchmarker.tt b/railties/lib/generators/rails/app/templates/script/performance/benchmarker.tt index 3abf448c15..da9df7fab9 100755 --- a/railties/lib/generators/rails/app/templates/script/performance/benchmarker.tt +++ b/railties/lib/generators/rails/app/templates/script/performance/benchmarker.tt @@ -1,3 +1,3 @@ <%= shebang %> -require File.dirname(__FILE__) + '/../../config/boot' +require File.expand_path('../../../config/boot', __FILE__) require 'commands/performance/benchmarker' |