Index: third_party/WebKit/.gitattributes |
diff --git a/third_party/WebKit/.gitattributes b/third_party/WebKit/.gitattributes |
index 06f175c4eb155e853d24b9005895a5bb2895c5c7..50bd5ebb52a328989c090580e7c6abf854f15838 100644 |
--- a/third_party/WebKit/.gitattributes |
+++ b/third_party/WebKit/.gitattributes |
@@ -1,8 +1,3 @@ |
# For best performance, place rules for deep paths in the parent directory. |
# For example: instead of "Source/WebCore/inspector/Inspector.json -crlf" here, |
# place "Inspector.json -crlf" in Source/WebCore/inspector/.gitattributes |
- |
-# TODO(thakis): Remove this after a while. |
-*.cpp merge=clang-format |
-*.h merge=clang-format |
-*.mm merge=clang-format |