From 8132f251cdddac6b840d41f45343de09bdc20047 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B8=A9=E5=B0=91?= <szujobs@hotmail.com>
Date: Sun, 20 May 2012 01:13:35 +0800
Subject: [PATCH] refactor

---
 .../druid/hbase/hbql/ast/HBQLCreateMappingStatement.java    | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLCreateMappingStatement.java b/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLCreateMappingStatement.java
index 7bb101eea3..cc080ac697 100644
--- a/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLCreateMappingStatement.java
+++ b/src/main/java/com/alibaba/druid/hbase/hbql/ast/HBQLCreateMappingStatement.java
@@ -1,16 +1,12 @@
 package com.alibaba.druid.hbase.hbql.ast;
 
-<<<<<<< HEAD
 import com.alibaba.druid.hbase.mapping.HMapping;
-=======
->>>>>>> ca778ea3c3ae05528c08c708193c8a4f79392825
 import com.alibaba.druid.sql.ast.SQLStatementImpl;
 
 public class HBQLCreateMappingStatement extends SQLStatementImpl implements HBQLStatement {
 
     private static final long serialVersionUID = 1L;
 
-<<<<<<< HEAD
     private HMapping          mapping          = new HMapping();
 
     public HMapping getMapping() {
@@ -21,6 +17,4 @@ public class HBQLCreateMappingStatement extends SQLStatementImpl implements HBQL
         this.mapping = mapping;
     }
 
-=======
->>>>>>> ca778ea3c3ae05528c08c708193c8a4f79392825
 }