Skip to content

Instantly share code, notes, and snippets.

@sandsu

sandsu/gist:4625369

Created January 24, 2013 17:22
Show Gist options
  • Save sandsu/4625369 to your computer and use it in GitHub Desktop.
Save sandsu/4625369 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1
Auto-merging app/views/home/dashboard.html.erb
CONFLICT (content): Merge conflict in app/views/home/dashboard.html.erb
Auto-merging app/controllers/mockups_controller.rb
Auto-merging app/assets/stylesheets/style.css.erb
Auto-merging app/assets/javascripts/script.js
Automatic merge failed; fix conflicts and then commit the result.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment