'commit'

10 months ago · 05479b7b47
parent ea2b39554a
commit 05479b7b47
1 changed files with 0 additions and 5 deletions
--- a/dsBase/src/main/java/com/dsideal/base/Menu/Model/MenuModel.java
+++ b/dsBase/src/main/java/com/dsideal/base/Menu/Model/MenuModel.java
@ -336,13 +336,8 @@ public class MenuModel {
    @Getter
    @Setter
    public static class Meta {
-<<<<<<< HEAD
        private String icon;
        private String big_icon;
-=======
-        private String big_icon;
-        private String small_icon;
->>>>>>> 5b0cb5da71c451cb655ca659f388fd07a0e53bf5
        private String title;
        private String isLink;
        private boolean isHide;