From f5f83e1f7ed75d6ed74669c6af23de8510d8b723 Mon Sep 17 00:00:00 2001 From: "tomhudson@google.com" Date: Fri, 24 Jun 2011 19:15:57 +0000 Subject: Fix bad merge which broke compiles. git-svn-id: http://skia.googlecode.com/svn/trunk@1716 2bbb7eff-a529-9590-31e7-b0007b416f81 --- bench/MatrixBench.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'bench/MatrixBench.cpp') 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: -- cgit v1.2.3