daily pastebin goal
39%
SHARE
TWEET

Untitled

a guest Dec 9th, 2018 61 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. app.socialtables.com git:(ko-svg)git merge development
  2. Auto-merging static/assets/images/table-icons.png
  3. CONFLICT (rename/delete): static/assets/images/loading.gif deleted in development and renamed in HEAD. Version HEAD of static/assets/images/loading.gif left in tree.
  4. Auto-merging static/assets/images/icon_settings.png
  5. Auto-merging static/assets/images/floorplan_icons/SocialTables_Floorplan-Icons-Staff.png
  6. CONFLICT (rename/delete): static/assets/images/asfalt_pattern.png deleted in development and renamed in HEAD. Version HEAD of static/assets/images/asfalt_pattern.png left in tree.
  7. Auto-merging server.js
  8. Auto-merging public/index.html
  9. CONFLICT (content): Merge conflict in public/index.html
  10. Removing public/documents/empty.txt
  11. Auto-merging public/assets/ko-templates/ko-settings-venue.html
  12. Auto-merging public/assets/ko-templates/ko-header.html
  13. CONFLICT (add/add): Merge conflict in public/assets/ko-templates/ko-header.html
  14. Auto-merging public/assets/ko-templates/ko-footer.html
  15. CONFLICT (content): Merge conflict in public/assets/ko-templates/ko-footer.html
  16. Auto-merging public/assets/js/models/viewmodel.js
  17. CONFLICT (content): Merge conflict in public/assets/js/models/viewmodel.js
  18. Auto-merging public/assets/js/models/guest.js
  19. CONFLICT (content): Merge conflict in public/assets/js/models/guest.js
  20. Auto-merging public/assets/js/models/glm.js
  21. CONFLICT (content): Merge conflict in public/assets/js/models/glm.js
  22. Auto-merging public/assets/js/models/event.js
  23. Auto-merging public/assets/js/models/editDialog.js
  24. CONFLICT (content): Merge conflict in public/assets/js/models/editDialog.js
  25. Auto-merging public/assets/js/models/dnd.js
  26. CONFLICT (content): Merge conflict in public/assets/js/models/dnd.js
  27. Auto-merging public/assets/js/main/main.js
  28. CONFLICT (content): Merge conflict in public/assets/js/main/main.js
  29. Auto-merging public/assets/js/helper/scripts.js
  30. CONFLICT (content): Merge conflict in public/assets/js/helper/scripts.js
  31. Auto-merging public/assets/js/helper/helper.js
  32. Auto-merging less/base.less
  33. CONFLICT (content): Merge conflict in less/base.less
  34. CONFLICT (modify/delete): dust/room-guest.svg.dust deleted in HEAD and modified in development. Version development of dust/room-guest.svg.dust left in tree.
  35. CONFLICT (modify/delete): dust/left-guest-tags.dust deleted in HEAD and modified in development. Version development of dust/left-guest-tags.dust left in tree.
  36. CONFLICT (modify/delete): dust/left-guest-guests.dust deleted in HEAD and modified in development. Version development of dust/left-guest-guests.dust left in tree.
  37. CONFLICT (modify/delete): dust/left-floor.dust deleted in HEAD and modified in development. Version development of dust/left-floor.dust left in tree.
  38. CONFLICT (modify/delete): dust/glm.dust deleted in HEAD and modified in development. Version development of dust/glm.dust left in tree.
  39. Automatic merge failed; fix conflicts and then commit the result.
  40. ➜  app.socialtables.com git:(ko-svg)
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