diff options
| author |  borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-08-01 13:30:54 +0000 |
|---|---|---|
| committer | borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-08-01 13:30:54 +0000 |
| commit | 47de6787a5aa677157fd468c5798eeb01c6c9139 (patch) | |
| tree | 41c5166aceedeef02da31cd6437857faf1df5d08 /whitespace.txt | |
| parent | d0bf319fb2e2a8d83fc64ad923c2202f6785772b (diff) | |
Whitespace change to see if local bot triggers a rebuild
git-svn-id: http://skia.googlecode.com/svn/trunk@4887 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'whitespace.txt')
| -rw-r--r-- | whitespace.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/whitespace.txt b/whitespace.txt index 8c49b98d8d..264974e328 100644 --- a/whitespace.txt +++ b/whitespace.txt @@ -40,8 +40,6 @@ You can modify this file to create no-op changelists. -<<<<<<< .mine -======= |