HDDS-1483. Fix getMultipartKey javadoc. (#790)

hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java

@@ -262,7 +262,6 @@ public interface OMMetadataManager {
   Table<byte[], byte[]> getS3Table();
 
   /**
-<<<<<<< HEAD
    * Returns the DB key name of a multipart upload key in OM metadata store.
    *
    * @param volume - volume name