HBASE-7753 [snapshot 130201 merge] Fix unresolved merge conflicts (Ted Yu)

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/hbase-7290v2@1446151 13f79535-47bb-0310-9956-ffa450edef68

hbase-server/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java

@@ -970,11 +970,7 @@ public final class ProtobufUtil {
    * Convert a delete KeyValue type to protocol buffer DeleteType.
    *
    * @param type
-<<<<<<< HEAD
    * @return protocol buffer DeleteType
-=======
-   * @return a DeleteType
->>>>>>> apache/trunk
    * @throws IOException
    */
   public static DeleteType toDeleteType(

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java

@@ -1957,10 +1957,7 @@ public class HRegion implements HeapSize { // , Writable{
 
   /**
    * Perform a batch put with no pre-specified locks
-<<<<<<< HEAD
-=======
    * @see HRegion#batchMutate(Pair[])
->>>>>>> apache/trunk
    */
   public OperationStatus[] put(Put[] puts) throws IOException {
     @SuppressWarnings("unchecked")

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java

@@ -3770,12 +3770,8 @@ public class HRegionServer implements ClientProtocol,
    *
    * @param region
    * @param mutate
-<<<<<<< HEAD
    * @return result to return to client if default operation should be
    * bypassed as indicated by RegionObserver, null otherwise
-=======
-   * @return the Result
->>>>>>> apache/trunk
    * @throws IOException
    */
   protected Result append(final HRegion region,