Advertisement
infected_

Untitled

Apr 6th, 2014
81
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.26 KB | None | 0 0
  1. infected_@mint-petra ~/cyan_11/frameworks/base $ git fetch https://github.com/IllusionRom/android_platform_frameworks_base illusion-4.4 && git cherry-pick 4d79d64f364518b98c710b636871655662d1dfae
  2. From https://github.com/IllusionRom/android_platform_frameworks_base
  3. * branch illusion-4.4 -> FETCH_HEAD
  4. warning: Cannot merge binary files: core/res/res/drawable-xxhdpi/switch_thumb_activated_holo_dark.9.png (HEAD vs. 4d79d64... fb: update missing google UI changes for 4.4)
  5. warning: Cannot merge binary files: core/res/res/drawable-xhdpi/switch_thumb_activated_holo_dark.9.png (HEAD vs. 4d79d64... fb: update missing google UI changes for 4.4)
  6. warning: Cannot merge binary files: core/res/res/drawable-mdpi/switch_thumb_activated_holo_dark.9.png (HEAD vs. 4d79d64... fb: update missing google UI changes for 4.4)
  7. warning: Cannot merge binary files: core/res/res/drawable-hdpi/switch_thumb_activated_holo_dark.9.png (HEAD vs. 4d79d64... fb: update missing google UI changes for 4.4)
  8. error: could not apply 4d79d64... fb: update missing google UI changes for 4.4
  9. hint: after resolving the conflicts, mark the corrected paths
  10. hint: with 'git add <paths>' or 'git rm <paths>'
  11. hint: and commit the result with 'git commit'
  12. infected_@mint-petra ~/cyan_11/frameworks/base $
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement