From 6710a10dcf621ab6ead30e3c4b6f99ea519a6d0d Mon Sep 17 00:00:00 2001
From: "sean.wang" <xalinx@gmail.com>
Date: Tue, 6 Mar 2012 16:37:37 +0800
Subject: [PATCH] merge

---
 cat-consumer/pom.xml                                          | 4 ++++
 .../java/com/dianping/cat/message/spi/MessageStorage.java     | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/cat-consumer/pom.xml b/cat-consumer/pom.xml
index 50b13a8b9..8207d1bd7 100644
--- a/cat-consumer/pom.xml
+++ b/cat-consumer/pom.xml
@@ -31,8 +31,12 @@
 			<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
diff --git a/cat-core/src/main/java/com/dianping/cat/message/spi/MessageStorage.java b/cat-core/src/main/java/com/dianping/cat/message/spi/MessageStorage.java
index fb6c51d55..b5ebb6e22 100644
--- a/cat-core/src/main/java/com/dianping/cat/message/spi/MessageStorage.java
+++ b/cat-core/src/main/java/com/dianping/cat/message/spi/MessageStorage.java
@@ -16,6 +16,7 @@ public interface MessageStorage {
 	public String store(MessageTree tree);
 
 	/**
+<<<<<<< HEAD
 	 * Fetch a message tree from the store.
 	 * 
 	 * @param messageId
@@ -28,6 +29,8 @@ public interface MessageStorage {
 	 * 
 	 * @param tree
 	 * 
+=======
+>>>>>>> 31515b8c1b82963a28412ab90fbd3229ea890f3f
 	 * Get relative path to base directory or base URL.
 	 * 
 	 * @param tree
-- 
GitLab