# HG changeset patch
# User Edho Arief <edho@myconan.net>
# Date 1354124616 28800
# Node ID 2b0a6d6925881f37548cc610113c9d9c3eb0efba
# Parent  3886be50efde3336a72580f1606f26bc5f514397
No need to explicitly require json.

diff -r 3886be50efde -r 2b0a6d692588 Gemfile
--- a/Gemfile	Wed Nov 28 09:40:56 2012 -0800
+++ b/Gemfile	Wed Nov 28 09:43:36 2012 -0800
@@ -10,8 +10,6 @@
 gem 'activerecord-jdbcmysql-adapter', :platforms => :jruby
 gem 'jruby-openssl', :platforms => :jruby
 
-gem 'json'
-
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
diff -r 3886be50efde -r 2b0a6d692588 Gemfile.lock
--- a/Gemfile.lock	Wed Nov 28 09:40:56 2012 -0800
+++ b/Gemfile.lock	Wed Nov 28 09:43:36 2012 -0800
@@ -125,7 +125,6 @@
   anjlab-bootstrap-rails (>= 2.0)
   jquery-rails
   jruby-openssl
-  json
   mysql2
   newrelic_rpm
   puma