From d0bf319fb2e2a8d83fc64ad923c2202f6785772b Mon Sep 17 00:00:00 2001
From: "borenet@google.com"
 <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Date: Tue, 31 Jul 2012 22:17:45 +0000
Subject: [PATCH] Whitespace change to see if local bot triggers a rebuild

git-svn-id: http://skia.googlecode.com/svn/trunk@4877 2bbb7eff-a529-9590-31e7-b0007b416f81
---
 whitespace.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/whitespace.txt b/whitespace.txt
index aaef719..8c49b98 100644
--- a/whitespace.txt
+++ b/whitespace.txt
@@ -45,4 +45,3 @@ You can modify this file to create no-op changelists.
 =======
 
 
->>>>>>> .r4782
-- 
2.7.4