Skip to content

Instantly share code, notes, and snippets.

@jortel

jortel/gist:4550649

Created January 16, 2013 20:31
Show Gist options
  • Save jortel/4550649 to your computer and use it in GitHub Desktop.
Save jortel/4550649 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
Auto-merging rel-eng/packages/pulp-builtins
CONFLICT (content): Merge conflict in rel-eng/packages/pulp-builtins
Auto-merging rel-eng/packages/pulp
CONFLICT (content): Merge conflict in rel-eng/packages/pulp
Auto-merging platform/pulp.spec
CONFLICT (content): Merge conflict in platform/pulp.spec
Auto-merging builtins/pulp-builtins.spec
CONFLICT (content): Merge conflict in builtins/pulp-builtins.spec
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment