Permalink
Browse files

Fixing gem_template merge

  • Loading branch information...
winton committed Dec 29, 2010
1 parent 2a2c932 commit 6bdf05405e3096db74d9fb09629a29338956588b
Showing with 2 additions and 7 deletions.
  1. +2 −2 acts_as_archive.gemspec
  2. +0 −5 spec/Rakefile
View
@@ -2,8 +2,8 @@
lib = File.expand_path('../lib/', __FILE__)
$:.unshift lib unless $:.include?(lib)
-require 'gem_template/gems'
-GemTemplate::Gems.gemset ||= :default
+require 'acts_as_archive/gems'
+ActsAsArchive::Gems.gemset ||= :default
Gem::Specification.new do |s|
ActsAsArchive::Gems.gemspec.hash.each do |key, value|
View
@@ -1,10 +1,5 @@
-<<<<<<< HEAD
require File.expand_path(File.dirname(__FILE__) + '/../lib/acts_as_archive/gems')
ActsAsArchive::Gems.activate :active_wrapper
-=======
-require File.expand_path(File.dirname(__FILE__) + '/../lib/gem_template/gems')
-GemTemplate::Gems.activate(:active_wrapper)
->>>>>>> a77b86e4ad5e105a89ecdbf8aeb0e7d4bcf6845a
require 'active_wrapper/tasks'

0 comments on commit 6bdf054

Please sign in to comment.