diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2012-04-19 11:09:41 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2012-04-19 11:09:41 +0100 |
| commit | 69be0151757f1802052b9895135d3047605e6338 (patch) | |
| tree | aaeab66bb26e21bbd582b243233db60f1a855f5d /vendor/gems/rspec-rails-1.3.3/init.rb | |
| parent | 17d8dad044dea0fc678d0bdc409700131685db86 (diff) | |
| parent | a33c560ab2a3a6c1090dc0334b85c46b9f45c107 (diff) | |
Merge branch 'develop' into purge-requests
Conflicts:
spec/controllers/request_controller_spec.rb
Diffstat (limited to 'vendor/gems/rspec-rails-1.3.3/init.rb')
| -rw-r--r-- | vendor/gems/rspec-rails-1.3.3/init.rb | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/vendor/gems/rspec-rails-1.3.3/init.rb b/vendor/gems/rspec-rails-1.3.3/init.rb deleted file mode 100644 index 6262f0368..000000000 --- a/vendor/gems/rspec-rails-1.3.3/init.rb +++ /dev/null @@ -1,9 +0,0 @@ -# Placeholder to satisfy Rails. -# -# Do NOT add any require statements to this file. Doing -# so will cause Rails to load this plugin all of the time. -# -# Running 'ruby script/generate rspec' will -# generate spec/spec_helper.rb, which includes the necessary -# require statements and configuration. This file should -# be required by all of your spec files.
\ No newline at end of file |