| Index: third_party/WebKit/Source/core/css/parser/CSSTokenizer.cpp
|
| diff --git a/third_party/WebKit/Source/core/css/parser/CSSTokenizer.cpp b/third_party/WebKit/Source/core/css/parser/CSSTokenizer.cpp
|
| index 4a4b6680167b5761e5f263bef473ba5f2a8a047e..982e098a7733f1a9381547451514de91174b5397 100644
|
| --- a/third_party/WebKit/Source/core/css/parser/CSSTokenizer.cpp
|
| +++ b/third_party/WebKit/Source/core/css/parser/CSSTokenizer.cpp
|
| @@ -210,6 +210,8 @@ CSSParserToken CSSTokenizer::semiColon(UChar cc) {
|
| return CSSParserToken(SemicolonToken);
|
| }
|
|
|
| +/* DO NOT SUBMIT - Merge conflict resolution marker.
|
| + * Please spell |Hash| below (not |GetHash|). */
|
| CSSParserToken CSSTokenizer::hash(UChar cc) {
|
| UChar nextChar = m_input.peekWithoutReplacement(0);
|
| if (isNameCodePoint(nextChar) ||
|
|
|