Skip to content

Instantly share code, notes, and snippets.

@tabrez
Created Aug 18, 2008
Embed
What would you like to do?
# Changed but not updated:
# (use "git add <file>..." to update what will be committed)
#
# unmerged: README
# modified: README
# unmerged: app/controllers/application.rb
# modified: app/controllers/application.rb
# unmerged: config/boot.rb
# modified: config/boot.rb
# unmerged: config/database.yml
# modified: config/database.yml
# unmerged: config/environment.rb
# modified: config/environment.rb
# unmerged: config/environments/development.rb
# modified: config/environments/development.rb
# unmerged: config/environments/production.rb
# modified: config/environments/production.rb
# unmerged: config/environments/test.rb
# modified: config/environments/test.rb
# unmerged: config/routes.rb
# modified: config/routes.rb
# unmerged: public/images/rails.png
# modified: public/images/rails.png
# unmerged: public/index.html
# modified: public/index.html
# unmerged: public/javascripts/controls.js
# modified: public/javascripts/controls.js
# unmerged: public/javascripts/dragdrop.js
# modified: public/javascripts/dragdrop.js
# unmerged: public/javascripts/effects.js
# modified: public/javascripts/effects.js
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment