Merge 900c62c72b into a73ca335a9

2015-08-11 03:24:02 +00:00 · 2015-08-11 03:24:02 +00:00 · fd998f68b2
commit fd998f68b2
parent a73ca335a9 900c62c72b
2 changed files with 3 additions and 4 deletions
--- a/1
+++ b/1
@ -76,7 +76,6 @@ gem 'prawn_rails'
 gem 'axlsx_rails'

 # for charts
-gem 'd3_rails'
 gem 'chart-js-rails'

 # as error catcher
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -119,8 +119,6 @@ GEM
      term-ansicolor
      thor
    currencies (0.4.2)
-    d3_rails (3.4.6)
-      railties (>= 3.1.0)
    daemons (1.1.9)
    database_cleaner (1.3.0)
    debugger-linecache (1.2.0)
@ -452,7 +450,6 @@ DEPENDENCIES
  cocoon
  country_select!
  coveralls
-  d3_rails
  daemons
  database_cleaner
  delayed_job_active_record
@ -504,3 +501,6 @@ DEPENDENCIES
  turbolinks
  uglifier (>= 1.3.0)
  whenever
+
+BUNDLED WITH
+   1.10.5