From a0570ebb150bb503bf136fcefd591b27e3edba44 Mon Sep 17 00:00:00 2001
From: Jian He <jianhe@apache.org>
Date: Mon, 9 Nov 2015 14:33:07 -0800
Subject: [PATCH] Fix CHANGES.txt for YARN-3840

---
 hadoop-yarn-project/CHANGES.txt | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 81d729cd65e..0f38fc91508 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -15,24 +15,9 @@ Release 2.7.3 - UNRELEASED
     YARN-4326. Fix TestDistributedShell timeout as AHS in MiniYarnCluster no longer 
     binds to default port 8188. (Meng Ding via wangda)
 
-<<<<<<< HEAD
-=======
     YARN-3840. Resource Manager web ui issue when sorting application by id (with
     application having id > 9999) (Mohammad Shahid Khan via jianhe)
 
-Release 2.7.3 - UNRELEASED
-
-  INCOMPATIBLE CHANGES
-
-  NEW FEATURES
-
-  IMPROVEMENTS
-
-  OPTIMIZATIONS
-
-  BUG FIXES
-
->>>>>>> a4ff03b... YARN-3840. Resource Manager web ui issue when sorting application by id (with application having id > 9999) Contributed by Mohammad Shahid Khan
 Release 2.7.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES