diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2012-02-15 10:02:30 +0000 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2012-02-15 10:02:30 +0000 |
| commit | dcc312ac215b57afc648725bb8d64ff287bf7798 (patch) | |
| tree | c22365bae12a7ba7c60dbb31dd88dc3e16a214fc /vendor/gems/json-1.5.1/lib/json.rb | |
| parent | 506af7a640f63b17000ccfc5e1344bbc3039c913 (diff) | |
Merge jpmckinney/bundler
Diffstat (limited to 'vendor/gems/json-1.5.1/lib/json.rb')
| -rw-r--r-- | vendor/gems/json-1.5.1/lib/json.rb | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/vendor/gems/json-1.5.1/lib/json.rb b/vendor/gems/json-1.5.1/lib/json.rb deleted file mode 100644 index 789b0de54..000000000 --- a/vendor/gems/json-1.5.1/lib/json.rb +++ /dev/null @@ -1,10 +0,0 @@ -require 'json/common' -module JSON - require 'json/version' - - begin - require 'json/ext' - rescue LoadError - require 'json/pure' - end -end |