[HBASE-7753] [snapshot 130201 merge] Fix unresolved merge conflicts

• Type: Sub-task
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Fix Version/s: 0.95.0
• Hadoop Flags: Reviewed
• Assignee: Ted Yu
• Reporter: Ted Yu
• Created: 02/Feb/13 18:42
• Updated: 23/Sep/13 18:30
• Resolved: 06/Feb/13 17:50

Description

Found the following in HRegionServer.java:

<<<<<<< HEAD
   * @return result to return to client if default operation should be
   * bypassed as indicated by RegionObserver, null otherwise
=======
   * @return the Result
>>>>>>> apache/trunk

In ProtobufUtil.java:

<<<<<<< HEAD
   * @return protocol buffer DeleteType
=======
   * @return a DeleteType
>>>>>>> apache/trunk

And in HRegion.java:

<<<<<<< HEAD
=======
   * @see HRegion#batchMutate(Pair[])
>>>>>>> apache/trunk
   */
  public OperationStatus[] put(Put[] puts) throws IOException {

Since the above is in javadoc, it doesn't affect compilation.