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

2019-05-02 00:51:11 -04:00 · 2019-05-02 00:51:11 -04:00 · f682a171f5
parent 7cb46f035a
commit f682a171f5
1 changed files with 0 additions and 1 deletions
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java
+++ b/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