From de5744c9035308654c7096bf5bd04e769a3a19e3 Mon Sep 17 00:00:00 2001
From: Anu Engineer <aengineer@apache.org>
Date: Sat, 23 Sep 2017 11:16:50 -0700
Subject: [PATCH] HDFS-12531. Fix conflict in the javadoc of
 UnderReplicatedBlocks.java in branch-2. Contributed by Bharat Viswanadham.

---
 .../hdfs/server/blockmanagement/UnderReplicatedBlocks.java  | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/UnderReplicatedBlocks.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/UnderReplicatedBlocks.java
index cd559a70dd1..4c2bbfce5f9 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/UnderReplicatedBlocks.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/UnderReplicatedBlocks.java
@@ -36,11 +36,7 @@ import org.apache.hadoop.hdfs.util.LightWeightLinkedSet;
  *
  * <p/>
  * The policy for choosing which priority to give added blocks
-<<<<<<< HEAD
- * is implemented in {@link #getPriority(int, int, int)}.
-=======
- * is implemented in {@link #getPriority(BlockInfo, int, int, int, int)}.
->>>>>>> 5411dc5... HDFS-9205. Do not schedule corrupt blocks for replication.  (szetszwo)
+ * is implemented in {@link #getPriority(int, int, int, int)}.
  * </p>
  * <p>The queue order is as follows:</p>
  * <ol>