jquerypp-rails 1.0.1.1.rc1 → 1.0.1.1.rc2

data/lib/jquerypp/generators/jquerypp/install/install_generator.rb

@@ -17,16 +17,14 @@ if ::Rails.version < "3.1" || !::Rails.application.config.assets.enabled
         def copy_jquerypp
           say_status("copying", "jQuery++ (#{Jquerypp::Rails::JQUERY_VERSION})", :green)
           copy_file "jquerypp.js", "public/javascripts/jquerypp.js"
+          copy_file "jquerypp.js", "vendor/assets/javascripts/jquerypp.js"
         end
 
 
         def copy_jquerypp_lib
           say_status("copying", "jQuery++ lib (#{Jquerypp::Rails::JQUERY_VERSION})", :green)
-<<<<<<< Updated upstream
-          copy_file "lib/.*", "public/javascripts/lib"
-=======
           copy_entry "lib/", "public/javascripts/lib"
->>>>>>> Stashed changes
+          copy_entry "lib/", "vendor/assets/javascripts/lib"
         end
         
       end

data/lib/jquerypp/rails/version.rb

@@ -1,6 +1,6 @@
 module Jquerypp
   module Rails
-    VERSION = "1.0.1.1.rc1"
+    VERSION = "1.0.1.1.rc2"
     JQUERYPP_VERSION = "1.0b2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jquerypp-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.1.1.rc1
+  version: 1.0.1.1.rc2
   prerelease: 8
 platform: ruby
 authors: