SHARE
TWEET

Untitled

a guest Jul 3rd, 2012 58 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. Daniel-Maldonados-MacBook-Pro:webgui daniel$ git pull https://github.com/plainblack/webgui
  2. From https://github.com/plainblack/webgui
  3.  * branch            HEAD       -> FETCH_HEAD
  4. Auto-merging selenium/README
  5. CONFLICT (add/add): Merge conflict in selenium/README
  6. Auto-merging selenium/adminConsole.html
  7. CONFLICT (add/add): Merge conflict in selenium/adminConsole.html
  8. Auto-merging selenium/assetHelpers.html
  9. CONFLICT (add/add): Merge conflict in selenium/assetHelpers.html
  10. Auto-merging selenium/clipboard.html
  11. CONFLICT (add/add): Merge conflict in selenium/clipboard.html
  12. Auto-merging selenium/login.html
  13. CONFLICT (add/add): Merge conflict in selenium/login.html
  14. Auto-merging selenium/logout.html
  15. CONFLICT (add/add): Merge conflict in selenium/logout.html
  16. Auto-merging selenium/newContentBasic.html
  17. CONFLICT (add/add): Merge conflict in selenium/newContentBasic.html
  18. Auto-merging selenium/newContentCommunity.html
  19. CONFLICT (add/add): Merge conflict in selenium/newContentCommunity.html
  20. Auto-merging selenium/newContentIntranet.html
  21. CONFLICT (add/add): Merge conflict in selenium/newContentIntranet.html
  22. Auto-merging selenium/newContentPrototypes.html
  23. CONFLICT (add/add): Merge conflict in selenium/newContentPrototypes.html
  24. Auto-merging selenium/newContentShop.html
  25. CONFLICT (add/add): Merge conflict in selenium/newContentShop.html
  26. Auto-merging selenium/newContentUtilities.html
  27. CONFLICT (add/add): Merge conflict in selenium/newContentUtilities.html
  28. Auto-merging selenium/turnOnAdmin.html
  29. CONFLICT (add/add): Merge conflict in selenium/turnOnAdmin.html
  30. Auto-merging selenium/versionTags.html
  31. CONFLICT (add/add): Merge conflict in selenium/versionTags.html
  32. Removing www/uploads/23/46/2346f7d68f56e7cc06094d9fd76f7a88/thumb-bg.gif
  33. Removing www/uploads/5d/07/5d0743a8392bf27b3c1b42a06f30ed25/thumb-tableft.gif
  34. Automatic merge failed; fix conflicts and then commit the result.
RAW Paste Data
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
 
Top