'commit'

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;