webkit/tools/layout_tests/test_expectations.txt - Issue 10963043: Fix typo from bad merge.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webkit/tools/layout_tests/test_expectations.txt

Issue 10963043: Fix typo from bad merge. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: webkit/tools/layout_tests/test_expectations.txt

diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt

index 21b24042d4f99bc23a7b41a213c2345ce5a9c29e..145811d8b5e7f143978931f51ca12634fff2c1f4 100644

--- a/webkit/tools/layout_tests/test_expectations.txt

+++ b/webkit/tools/layout_tests/test_expectations.txt

@@ -1,4 +1,3 @@

-<<<<<<< HEAD

# This file should almost always be empty. Normally Chromium test expectations

# are only put here temporarily, and moved to

# src/third_party/WebKit/LayoutTests/platform/chromium/TestExpectations

« no previous file with comments | « no previous file | no next file » | no next file with comments »