projects / platform / upstream / libSkiaSharp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ae57c17)
Whitespace change to trigger rebuild after slave script modifications
authorborenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Thu, 26 Jul 2012 15:14:57 +0000 (15:14 +0000)
committerborenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Thu, 26 Jul 2012 15:14:57 +0000 (15:14 +0000)
git-svn-id: http://skia.googlecode.com/svn/trunk@4783 2bbb7eff-a529-9590-31e7-b0007b416f81

whitespace.txt patch | blob | history

diff --git a/whitespace.txt b/whitespace.txt
index d5a7725..aaef719 100644 (file)
--- a/whitespace.txt
+++ b/whitespace.txt
@@ -40,5 +40,9 @@ You can modify this file to create no-op changelists.
 
 
 
+<<<<<<< .mine
 
+=======
 
+
+>>>>>>> .r4782
Domain: Dotnet / API;