diff options
| author |  borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-07-26 15:14:57 +0000 |
|---|---|---|
| committer | borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-07-26 15:14:57 +0000 |
| commit | 904160772ed097cd481d6fcd8a3f4bf0a1af8b52 (patch) | |
| tree | 60d5b6ed91a2fc134a2ece5f45d99d27fae837ec /whitespace.txt | |
| parent | ae57c17abebf6819e52e80d7df5db5b745156d16 (diff) | |
Whitespace change to trigger rebuild after slave script modifications
git-svn-id: http://skia.googlecode.com/svn/trunk@4783 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'whitespace.txt')
| -rw-r--r-- | whitespace.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/whitespace.txt b/whitespace.txt index d5a772572a..aaef7196e2 100644 --- a/whitespace.txt +++ b/whitespace.txt @@ -40,5 +40,9 @@ You can modify this file to create no-op changelists. +<<<<<<< .mine +======= + +>>>>>>> .r4782 |