diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java index b932c11..08f8ba6 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java +++ b/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( diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java index 21184fb..658abab 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java +++ b/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") diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java index 725d494..251a26e 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -3770,12 +3770,7 @@ 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,