Merge branch 'master' into complex_geom

geoblacklight · Feb 13, 2017 · e3f53a6 · e3f53a6
2 parents a7b946e + 72e7f0a
commit e3f53a6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/lib/generators/geoblacklight/install_generator.rb b/lib/generators/geoblacklight/install_generator.rb
@@ -6,10 +6,6 @@ class Install < Rails::Generators::Base
 
     desc 'Install Geoblacklight'
 
-    def add_solr_wrapper
-      generate 'blacklight:solr5'
-    end
-
     def mount_geoblacklight_engine
       route "mount Geoblacklight::Engine => 'geoblacklight'"
     end

diff --git a/template.rb b/template.rb
@@ -4,6 +4,6 @@
 run 'bundle install'
 
 generate 'blacklight:install', '--devise'
-generate 'geoblacklight:install', '--solrwrapper', '-f'
+generate 'geoblacklight:install', '-f'
 
 rake 'db:migrate'