Bug 99828 – [EFL] Gardening to make the bots green

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit EFL

[Sudarsana Nagineni (babu)]

Gardening to make the bots green.

Regressions: Unexpected text-only failures : (4)
  editing/pasteboard/copy-paste-first-line-in-textarea.html [ Failure ] 
  fast/lists/w3-css3-list-styles-alphabetic.html [ Failure ] 
  fast/lists/w3-css3-list-styles-fallback-style.html [ Failure ] 
  fast/lists/w3-list-styles.html [ Failure ]

[Sudarsana Nagineni (babu)]

Created attachment 169589 [details]
Patch

[Sudarsana Nagineni (babu)]

Created attachment 169593 [details]
Patch V2

[WebKit Review Bot]

Comment on attachment 169593 [details]
Patch V2

Rejecting attachment 169593 [details] from commit-queue.

Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2

Last 500 characters of output:
CT (content): Merge conflict in Source/WebCore/ChangeLog
Failed to merge in the changes.
Patch failed at 0001 [EFL] Rebaseline pixel expectation that is rendered correctly now.

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".

rebase refs/remotes/origin/master: command returned error: 1

Died at Tools/Scripts/update-webkit line 164.

Full output: http://queues.webkit.org/results/14461409

[WebKit Review Bot]

Comment on attachment 169593 [details]
Patch V2

Clearing flags on attachment: 169593

Committed r131890: <http://trac.webkit.org/changeset/131890>

[WebKit Review Bot]

All reviewed patches have been landed.  Closing bug.