Advertisement
Guest User

Untitled

a guest
Dec 22nd, 2014
135
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.99 KB | None | 0 0
  1. Ozone-Wayland: patching Chromium
  2. Checking out files: 100% (14049/14049), done.
  3. Switched to branch 'master'
  4. Your branch is behind 'origin/master' by 15 commits, and can be fast-forwarded.
  5. (use "git pull" to update your local branch)
  6. Deleted branch master-ozone (was 68d79df).
  7. Switched to a new branch 'master-ozone'
  8. Applying: Browser: Support Desktop Aura creation on Ozone
  9. error: patch failed: chrome/chrome_browser_ui.gypi:2293
  10. error: chrome/chrome_browser_ui.gypi: patch does not apply
  11. Patch failed at 0001 Browser: Support Desktop Aura creation on Ozone
  12. The copy of the patch that failed is found in:
  13. /home/ubuntu/git/chromium/src/.git/rebase-apply/patch
  14. When you have resolved this problem, run "git am --continue".
  15. If you prefer to skip this patch, run "git am --skip" instead.
  16. To restore the original branch and stop patching, run "git am --abort".
  17. Checking out files: 100% (979/979), done.
  18. HEAD is now at d3c6a51 Make RelayServerTest use VirtualSocketServer.
  19. Applying: Fix build warnings
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement