Skip to content

Instantly share code, notes, and snippets.

@jfirebaugh

jfirebaugh/gist:5286424

Created April 1, 2013 17:40
Show Gist options
  • Save jfirebaugh/5286424 to your computer and use it in GitHub Desktop.
Save jfirebaugh/5286424 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
~/Development/openstreetmap-website bundle
Your Gemfile.lock contains merge conflicts.
Run `git checkout HEAD -- Gemfile.lock` first to get a clean lock.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment