diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2012-03-12 13:05:19 +0000 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2012-03-12 13:05:19 +0000 |
| commit | 37bff4c0154b57b35a3194a9b31a9422496b955b (patch) | |
| tree | 61592a6bb9d1d9fea378a6e4efa8fdf7d5525b8a /vendor/gems/json-1.5.1/lib/json.rb | |
| parent | 8b49dc894066e452232cabd09333895487f86986 (diff) | |
| parent | 8acea24f98268fbb9b73b66b9e98a1788a3b30ac (diff) | |
Merge branch 'merged-bundler' into develop
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 |