diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2010-03-11 22:07:48 +1100 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-03-11 22:07:48 +1100 |
| commit | 965fe59bff249ad91131a444e1fbd63dc4411db3 (patch) | |
| tree | ec2d54d5eaad9e32bce1758e6a67c364279bbd39 /load_paths.rb | |
| parent | 79f02a473cb6aef00003745f23802314c8c89e7d (diff) | |
| parent | 4adcbb6b2d6cef49ac28df4254ac74e09f14dcf7 (diff) | |
| download | rails-965fe59bff249ad91131a444e1fbd63dc4411db3.tar.gz rails-965fe59bff249ad91131a444e1fbd63dc4411db3.tar.bz2 rails-965fe59bff249ad91131a444e1fbd63dc4411db3.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'load_paths.rb')
| -rw-r--r-- | load_paths.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/load_paths.rb b/load_paths.rb index 55e2a530bd..d5f2ca0734 100644 --- a/load_paths.rb +++ b/load_paths.rb @@ -1,5 +1,5 @@ begin - require File.expand_path('../vendor/environment', __FILE__) + require File.expand_path('../.bundle/environment', __FILE__) rescue LoadError begin require 'rubygems' @@ -18,4 +18,4 @@ rescue LoadError $:.unshift File.expand_path("../#{framework}/lib", __FILE__) end end -end
\ No newline at end of file +end |