合并冲突

designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/PatternBackgroundQuickPane.java

@@ -73,7 +73,7 @@ public class PatternBackgroundQuickPane extends BackgroundQuickPane {
                         cell(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background"), UILabel.LEFT))
                                 .with(it -> it.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background"))).weight(1),
                         cell(backgroundColorPane).weight(4)),
-                row(cell(foregroundLabel).weight(1), cell(foregroundColorPane).weight(4)),
+                row(cell(foregroundLabel).weight(1), cell(foregroundColorPane).weight(4))
             ).with(it -> it.setBorder(new ScaledEmptyBorder(LayoutConstants.VERTICAL_GAP, 0, 0, 0))).getComponent(), BorderLayout.CENTER);
         foregroundColorPane.addSelectChangeListener(colorChangeListener);
         backgroundColorPane.addSelectChangeListener(colorChangeListener);