# HG changeset patch
# User edogawaconan <me@myconan.net>
# Date 1409909382 -32400
# Node ID 489002ad6ebf633ae8ab8a7e3f0e4f768984574a
# Parent  399d36c079c4eee4366c43416e73a073da0149d9
Remove jbuilder.

diff -r 399d36c079c4 -r 489002ad6ebf Gemfile
--- a/Gemfile	Fri Sep 05 18:26:23 2014 +0900
+++ b/Gemfile	Fri Sep 05 18:29:42 2014 +0900
@@ -4,7 +4,7 @@
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '4.1.4'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 2.0'
+# gem 'jbuilder', '~> 2.0'
 # bundle exec rake doc:rails generates the API under doc/api.
 gem 'sdoc', '~> 0.4.0',      group: :doc
 
diff -r 399d36c079c4 -r 489002ad6ebf Gemfile.lock
--- a/Gemfile.lock	Fri Sep 05 18:26:23 2014 +0900
+++ b/Gemfile.lock	Fri Sep 05 18:29:42 2014 +0900
@@ -32,9 +32,6 @@
     erubis (2.7.0)
     hike (1.2.3)
     i18n (0.6.11)
-    jbuilder (2.1.3)
-      activesupport (>= 3.0.0, < 5)
-      multi_json (~> 1.2)
     json (1.8.1)
     mail (2.5.4)
       mime-types (~> 1.16)
@@ -90,7 +87,6 @@
   ruby
 
 DEPENDENCIES
-  jbuilder (~> 2.0)
   rails (= 4.1.4)
   sdoc (~> 0.4.0)
   spring