projects / platform / upstream / libSkiaSharp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d0bf319)
Whitespace change to see if local bot triggers a rebuild
authorborenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Wed, 1 Aug 2012 13:30:54 +0000 (13:30 +0000)
committerborenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Wed, 1 Aug 2012 13:30:54 +0000 (13:30 +0000)
git-svn-id: http://skia.googlecode.com/svn/trunk@4887 2bbb7eff-a529-9590-31e7-b0007b416f81

whitespace.txt patch | blob | history

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