Advertisement
NoiseDoll

git

Jun 19th, 2015
250
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.12 KB | None | 0 0
  1. D:\Dev\moVirt>git am C:\Users\Nika\Desktop\0001-Added-host-events-and-status-ico
  2. n-to-CameraActivity.patch
  3. Applying: - Added host events and status icon to CameraActivity.
  4. error: patch failed: moVirt/src/main/java/org/ovirt/mobile/movirt/ui/CameraActiv
  5. ity.java:3
  6. error: moVirt/src/main/java/org/ovirt/mobile/movirt/ui/CameraActivity.java: patc
  7. h does not apply
  8. error: patch failed: moVirt/src/main/res/layout/activity_camera.xml:1
  9. error: moVirt/src/main/res/layout/activity_camera.xml: patch does not apply
  10. error: patch failed: moVirt/src/main/res/values/strings.xml:136
  11. error: moVirt/src/main/res/values/strings.xml: patch does not apply
  12. error: patch failed: moVirt/src/main/res/values/styles.xml:84
  13. error: moVirt/src/main/res/values/styles.xml: patch does not apply
  14. Patch failed at 0001 - Added host events and status icon to CameraActivity.
  15. The copy of the patch that failed is found in:
  16. d:/Dev/moVirt/.git/rebase-apply/patch
  17. When you have resolved this problem, run "git am --continue".
  18. If you prefer to skip this patch, run "git am --skip" instead.
  19. To restore the original branch and stop patching, run "git am --abort".
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement