[incubator-iotdb] branch fix_many_bugs updated: fix conilct javadoc

[qi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch fix_many_bugs
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git


The following commit(s) were added to refs/heads/fix_many_bugs by this push:
     new f56d839  fix conilct javadoc
f56d839 is described below

commit f56d8397e5ad1f0dec7174557a87976d67458e30
Author: qiaojialin <64...@qq.com>
AuthorDate: Tue Mar 31 20:13:40 2020 +0800

    fix conilct javadoc
---
 .../apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java   | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
index 07718a4..28647da 100755
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
@@ -1700,15 +1700,10 @@ public class StorageGroupProcessor {
 
   /**
    * If the historical versions of a file is a sub-set of the given file's, remove it to reduce
-<<<<<<< HEAD
-   * unnecessary merge. Only used when the file sender and the receiver share the same file close
-   * policy.
-=======
    * unnecessary merge. Only used when the file sender and the receiver share the same file
    * close policy.
    * Warning: DO NOT REMOVE
    * @param resource
->>>>>>> master
    */
   @SuppressWarnings("unused")
   public void removeFullyOverlapFiles(TsFileResource resource) {