modify the cat version

cat-core/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.dianping.cat</groupId>
 		<artifactId>parent</artifactId>
-		<version>0.2.0</version>
+		<version>0.2.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>cat-core</artifactId>

cat-job/src/test/java/com/dianping/cat/job/sql/SqlRecordTest.java

@@ -23,10 +23,6 @@ public class SqlRecordTest {
 	@Test
 	public void testBlankReplace(){
 		SqlStatementKey key = new SqlStatementKey();
-<<<<<<< HEAD
-=======
-		String excepted ="";
->>>>>>> 9403be6e2abceeb07ae420e75eea33204d4ca53d
 		String str = "sdf		123 	\nfddf	 43	fd";
 		str = key.replaceBlank(str);
 		String temp =str.replaceAll("\\s", "*");

pom.xml

@@ -18,7 +18,7 @@
 			<dependency>
 				<groupId>com.dianping.cat</groupId>
 				<artifactId>cat-core</artifactId>
-				<version>0.2.0</version>
+				<version>0.2.1</version>
 			</dependency>
 			<dependency>
 				<groupId>com.dianping.cat</groupId>