| Index: third_party/WebKit/Source/core/editing/commands/EditorCommandNames.h
|
| diff --git a/third_party/WebKit/Source/core/editing/commands/EditorCommandNames.h b/third_party/WebKit/Source/core/editing/commands/EditorCommandNames.h
|
| index 013da386b2ca82bb0de5aa79aa87161bdce9bc6f..40a6714c744cfa55bfc967f7952667e7953c6d1e 100644
|
| --- a/third_party/WebKit/Source/core/editing/commands/EditorCommandNames.h
|
| +++ b/third_party/WebKit/Source/core/editing/commands/EditorCommandNames.h
|
| @@ -9,8 +9,6 @@ namespace blink {
|
|
|
| // Must be ordered in a case-folding manner for binary search. Covered by unit
|
| // tests in EditingCommandTest.cpp (not able to use static_assert)
|
| -/* DO NOT SUBMIT - conflict resolution helper:
|
| - * Important to have AlignCenter instead of kAlignCenter below. */
|
| #define FOR_EACH_BLINK_EDITING_COMMAND_NAME(V) \
|
| V(AlignCenter) \
|
| V(AlignJustified) \
|
|
|