fix merge conflict

iamdionysus · May 21, 2015 · 87c8675 · 87c8675
2 parents 6df4a1c + e8ec59a
commit 87c8675
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/flavor_gem.gemspec b/flavor_gem.gemspec
@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.description   = "Flavors bundler generated Rubygem and scaffolding"
   spec.homepage      = "http://github.com/iamdionysus/flavor_gem"
 
-  spec.files         = %w(flavor_gem.gemspec) + Dir["*.md", "bin/*", "lib/**/*.rb", "lib/template/*"]
+  spec.files         = %w(flavor_gem.gemspec) + Dir["*.md", "bin/*", "lib/**/*.rb", "template/*"]
   spec.bindir        = "bin"
   spec.executables   = %w(flavor-gem)
   spec.require_paths = ["lib"]

diff --git a/lib/flavor_gem/util.rb b/lib/flavor_gem/util.rb
@@ -58,7 +58,6 @@ def append_template_to_file(file_name, template)
     end
 
     def template_file_name(template)
-      # "lib/flavor_gem/template/#{template}"
       File.expand_path("../../../template/#{template}", __FILE__)
     end