Permalink
Browse files

Merge branch 'bundler'

Conflicts:
	Gemfile
  • Loading branch information...
2 parents 3342771 + e7f2ac7 commit f270841bce914725cb8cca94033d41619d173e68 @splattael splattael committed Oct 26, 2010
Showing with 1 addition and 1 deletion.
  1. +1 −1 Gemfile
View
@@ -14,4 +14,4 @@ end
gem 'defined-by'
# TODO: use `gemspec` instead
-# in order to this we have to gemspec first!
+# in order to use `gemspec` we have to create and commit gemspec first!

0 comments on commit f270841

Please sign in to comment.