spree/spree-guides — pull request #216 by maco (2014-03-25 16:13:42+00:00)
Title: Resolve merge conflict in getting started guide

The code box to install rails has a merge conflict in it:

<<<<<<< HEAD
$ gem install rails -v 4.0.1
=======
$ gem install rails -v 4.0.4
>>>>>>> d0dca6b... Update GS guide to use Rails 4.0.4