解决冲突

3 years ago · 555e1dcd18
1 changed files with 0 additions and 3 deletions
--- a/designer-base/src/main/java/com/fr/design/mainframe/theme/FormThemeProfilePane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/theme/FormThemeProfilePane.java
@ -1,6 +1,5 @@
 package com.fr.design.mainframe.theme;

-import com.fr.base.theme.FineColorManager;
 import com.fr.base.theme.FormTheme;
 import com.fr.base.theme.TemplateThemeConfig;
 import com.fr.base.theme.settings.ThemedComponentStyle;
@ -13,8 +12,6 @@ import com.fr.design.mainframe.theme.edit.FormBodyStyleEditPane;
 import com.fr.design.mainframe.theme.preview.FormThemePreviewPane;

 import javax.swing.JPanel;
-import java.util.List;
-import java.awt.Color;

 import static com.fr.design.i18n.Toolkit.i18nText;