diff options
| author |  tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-06-24 19:15:57 +0000 |
|---|---|---|
| committer | tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-06-24 19:15:57 +0000 |
| commit | f5f83e1f7ed75d6ed74669c6af23de8510d8b723 (patch) | |
| tree | 32ee852512d5bbad6b43b1c58a7ff1a94c970976 /bench | |
| parent | 4eed340935c1d4fdbfae58675b15097a83cb26fb (diff) | |
Fix bad merge which broke compiles.
git-svn-id: http://skia.googlecode.com/svn/trunk@1716 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'bench')
| -rw-r--r-- | bench/MatrixBench.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/bench/MatrixBench.cpp b/bench/MatrixBench.cpp index 865e6f2abe..680241a11e 100644 --- a/bench/MatrixBench.cpp +++ b/bench/MatrixBench.cpp @@ -295,8 +295,6 @@ class ScaleTransMixedMatrixBench : public MatrixBench { SkRandom fRandom; typedef MatrixBench INHERITED; }; ->>>>>>> .r1709 - class ScaleTransDoubleMatrixBench : public MatrixBench { public: |