Ignore .rspec
Merge branch 'master' of github.com:RiotGames/berkshelf-vagrant
It worked on my machine....because I had set our VERSION to 1.2 :-)
Merge branch '22-vagrant-12-ui'