API tools faq
paste
Advertisement
ijontichy

ohgodconflictseverywhere

ijontichy
Feb 7th, 2013
92
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 3.53 KB | None | 0 0
raw download clone embed print report
  1. CONFLICT (rename/rename): Rename "pk3/sprites/QUDDD0.png"->"pk3/sprites/QUDTD0.png" in branch "HEAD" rename "pk3/sprites/QUDDD0.png"->"pk3/sprites/chex/QUDTD0.png" in "master"
  2. CONFLICT (rename/rename): Rename "pk3/sprites/QUDDC0.png"->"pk3/sprites/QUDTC0.png" in branch "HEAD" rename "pk3/sprites/QUDDC0.png"->"pk3/sprites/chex/QUDTC0.png" in "master"
  3. CONFLICT (rename/rename): Rename "pk3/sprites/QUDDB0.png"->"pk3/sprites/QUDTB0.png" in branch "HEAD" rename "pk3/sprites/QUDDB0.png"->"pk3/sprites/chex/QUDTB0.png" in "master"
  4. CONFLICT (rename/rename): Rename "pk3/sprites/QUDDA0.png"->"pk3/sprites/QUDTA0.png" in branch "HEAD" rename "pk3/sprites/QUDDA0.png"->"pk3/sprites/chex/QUDTA0.png" in "master"
  5. CONFLICT (rename/rename): Rename "pk3/sprites/PLSCB0.png"->"pk3/sprites/PHSCB0.png" in branch "HEAD" rename "pk3/sprites/PLSCB0.png"->"pk3/sprites/chex/PHSCB0.png" in "master"
  6. CONFLICT (rename/rename): Rename "pk3/sprites/PLSCA0.png"->"pk3/sprites/PHSCA0.png" in branch "HEAD" rename "pk3/sprites/PLSCA0.png"->"pk3/sprites/chex/PHSCA0.png" in "master"
  7. CONFLICT (modify/delete): pk3/graphics/QUAKTIP3.png deleted in master and modified in HEAD. Version HEAD of pk3/graphics/QUAKTIP3.png left in tree.
  8. CONFLICT (modify/delete): pk3/graphics/QUAKTIP2.png deleted in master and modified in HEAD. Version HEAD of pk3/graphics/QUAKTIP2.png left in tree.
  9. CONFLICT (modify/delete): pk3/graphics/QUAKTIP1.png deleted in master and modified in HEAD. Version HEAD of pk3/graphics/QUAKTIP1.png left in tree.
  10. CONFLICT (modify/delete): pk3/graphics/DUKETIP3.png deleted in master and modified in HEAD. Version HEAD of pk3/graphics/DUKETIP3.png left in tree.
  11. CONFLICT (modify/delete): pk3/graphics/DUKETIP2.png deleted in master and modified in HEAD. Version HEAD of pk3/graphics/DUKETIP2.png left in tree.
  12. CONFLICT (content): Merge conflict in pk3/decorate/ranger/slot7.dec
  13. CONFLICT (content): Merge conflict in pk3/decorate/ranger/slot6.dec
  14. CONFLICT (content): Merge conflict in pk3/decorate/ranger/slot5.dec
  15. CONFLICT (content): Merge conflict in pk3/decorate/ranger/slot4.dec
  16. CONFLICT (content): Merge conflict in pk3/decorate/ranger/slot3.dec
  17. CONFLICT (content): Merge conflict in pk3/decorate/ranger/slot2.dec
  18. CONFLICT (content): Merge conflict in pk3/decorate/ranger/slot1.dec
  19. CONFLICT (content): Merge conflict in pk3/decorate/ranger/pistol.dec
  20. CONFLICT (content): Merge conflict in pk3/decorate/ranger/fist.dec
  21. CONFLICT (content): Merge conflict in pk3/decorate/parias/player.dec
  22. CONFLICT (content): Merge conflict in pk3/decorate/marathon/unique.dec
  23. CONFLICT (content): Merge conflict in pk3/decorate/marathon/slot4.dec
  24. CONFLICT (content): Merge conflict in pk3/decorate/marathon/player.dec
  25. CONFLICT (content): Merge conflict in pk3/decorate/duke/unique.dec
  26. CONFLICT (content): Merge conflict in pk3/decorate/duke/slot7.dec
  27. CONFLICT (content): Merge conflict in pk3/decorate/duke/player.dec
  28. CONFLICT (content): Merge conflict in pk3/decorate/doomguy/player.dec
  29. CONFLICT (content): Merge conflict in pk3/decorate/corvus/player.dec
  30. CONFLICT (content): Merge conflict in pk3/decorate/core/ammo.dec
  31. CONFLICT (content): Merge conflict in pk3/decorate/chexguy/player.dec
  32. CONFLICT (content): Merge conflict in pk3/actors/KEYS
  33. CONFLICT (content): Merge conflict in pk3/actors/GAME_HEXEN
  34. CONFLICT (content): Merge conflict in pk3/acs/samsaraFuncs.h
  35. CONFLICT (content): Merge conflict in pk3/acs/samsaraDefs.h
  36. CONFLICT (content): Merge conflict in pk3/acs/samsara.o
  37. CONFLICT (content): Merge conflict in pk3/acs/samsara.c
  38. CONFLICT (content): Merge conflict in pk3/SBARINFO
  39. CONFLICT (content): Merge conflict in pk3/KEYCONF
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!