merge

cat-consumer/pom.xml

@@ -31,15 +31,7 @@
 			<plugin>
 				<groupId>com.site.maven.plugins</groupId>
 				<artifactId>maven-codegen-plugin</artifactId>
-<<<<<<< HEAD
-<<<<<<< HEAD
 				<version>1.0.10</version>
-=======
-				<version>1.0.9</version>
->>>>>>> 31515b8c1b82963a28412ab90fbd3229ea890f3f
-=======
-				<version>1.0.9</version>
->>>>>>> 31515b8c1b82963a28412ab90fbd3229ea890f3f
 				<executions>
 					<execution>
 						<id>generate failure report model</id>

cat-core/src/main/java/com/dianping/cat/message/spi/MessageStorage.java

@@ -16,7 +16,6 @@ public interface MessageStorage {
 	public String store(MessageTree tree);
 
 	/**
-<<<<<<< HEAD
 	 * Fetch a message tree from the store.
 	 * 
 	 * @param messageId
@@ -25,12 +24,7 @@ public interface MessageStorage {
 	public MessageTree get(String messageId);
 
 	/**
-	 * Get relative path to base directory or base URL.
-	 * 
-	 * @param tree
 	 * 
-=======
->>>>>>> 31515b8c1b82963a28412ab90fbd3229ea890f3f
 	 * Get relative path to base directory or base URL.
 	 * 
 	 * @param tree