Skip to content

Commit

Permalink
Conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
Josep M. Bach committed Apr 8, 2011
2 parents 0819822 + 71cd3e8 commit 899063b
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 2 deletions.
Empty file added .gemtest
Empty file.
1 change: 1 addition & 0 deletions .rspec
@@ -1 +1,2 @@
--color
--format documentation
2 changes: 1 addition & 1 deletion Gemfile.lock
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
rpn (0.0.1)
rpn (0.0.2)

GEM
remote: http://rubygems.org/
Expand Down
2 changes: 1 addition & 1 deletion lib/rpn/version.rb
@@ -1,3 +1,3 @@
module RPN
VERSION = "0.0.1"
VERSION = "0.0.2"
end

0 comments on commit 899063b

Please sign in to comment.