Skip to content

Instantly share code, notes, and snippets.

@claudinec

claudinec/gist:226453

Created November 4, 2009 22:37
Show Gist options
  • Save claudinec/226453 to your computer and use it in GitHub Desktop.
Save claudinec/226453 to your computer and use it in GitHub Desktop.
Download ZIP
find conflicted files in Dropbox
Raw
gistfile1.eclass
find ~/Dropbox -name "*conflict*"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment