From: borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Date: Wed, 1 Aug 2012 13:30:54 +0000 (+0000)
Subject: Whitespace change to see if local bot triggers a rebuild
X-Git-Tag: accepted/tizen/5.0/unified/20181102.025319~15348
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=47de6787a5aa677157fd468c5798eeb01c6c9139;p=platform%2Fupstream%2FlibSkiaSharp.git

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
---

diff --git a/whitespace.txt b/whitespace.txt
index 8c49b98..264974e 100644
--- a/whitespace.txt
+++ b/whitespace.txt
@@ -40,8 +40,6 @@ You can modify this file to create no-op changelists.
 
 
 
-<<<<<<< .mine
 
-=======