Skip to content

Instantly share code, notes, and snippets.

@tomka

tomka/fiji_pull

Created March 17, 2010 13:21
Show Gist options
  • Save tomka/335212 to your computer and use it in GitHub Desktop.
Save tomka/335212 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
fiji_pull
[...]
# Unmerged paths:
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# both modified: ImageJA
#
[...]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment