merge conflicts

2019-10-29 15:28:10 +08:00 · 2019-10-29 15:28:10 +08:00 · 663b89deb6
parent 58b543cb9e a276f27c7b
commit 663b89deb6
1 changed files with 1 additions and 0 deletions
--- a/src/main/java/run/halo/app/utils/XmlTransferMapUtils.java
+++ b/src/main/java/run/halo/app/utils/XmlTransferMapUtils.java
@ -13,6 +13,7 @@ import java.util.*;
 * @date 2019-10-29 14:49
 */
 public class XmlTransferMapUtils {
+
    /**
     * 存储在此集合中的节点名称都会被解析为一个List存储
     */