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
2012-08-01 13:30:54 +00:00 · 2012-08-01 13:30:54 +00:00 · 47de6787a5
commit 47de6787a5
parent d0bf319fb2
1 changed files with 1 additions and 3 deletions
--- a/whitespace.txt
+++ b/whitespace.txt
@ -40,8 +40,6 @@ You can modify this file to create no-op changelists.



-<<<<<<< .mine
-
-=======
+