HADOOP-4116. Fixing change log to reflect it is fixed in 0.18.2.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.19@699107 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -724,14 +724,15 @@ Release 0.19.0 - Unreleased
     HADOOP-4249. Fix eclipse path to include the hsqldb.jar. (szetszwo via
     omalley)
 
-<<<<<<< .working
-    HADOOP-4116. Balancer should provide better resource management. (hairong)
-
-=======
     HADOOP-4247. Move InputSampler into org.apache.hadoop.mapred.lib, so that
     examples.jar doesn't depend on tools.jar. (omalley)
 
->>>>>>> .merge-right.r699092
+Release 0.18.2 - Unreleased
+
+  BUG FIXES
+
+    HADOOP-4116. Balancer should provide better resource management. (hairong)
+
 Release 0.18.1 - 2008-09-17
 
   IMPROVEMENTS