| Index: third_party/WebKit/.gitattributes
|
| diff --git a/third_party/WebKit/.gitattributes b/third_party/WebKit/.gitattributes
|
| index f9907f1058fdaf122cacc0db1639a203a4520ff9..06f175c4eb155e853d24b9005895a5bb2895c5c7 100644
|
| --- a/third_party/WebKit/.gitattributes
|
| +++ b/third_party/WebKit/.gitattributes
|
| @@ -2,10 +2,6 @@
|
| # For example: instead of "Source/WebCore/inspector/Inspector.json -crlf" here,
|
| # place "Inspector.json -crlf" in Source/WebCore/inspector/.gitattributes
|
|
|
| -# Exclude these git specific files from archives created via git-archive.
|
| -.gitignore export-ignore
|
| -.gitattributes export-ignore
|
| -
|
| # TODO(thakis): Remove this after a while.
|
| *.cpp merge=clang-format
|
| *.h merge=clang-format
|
|
|