解决冲突

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/CategoryPlotReportDataContentPane.java

@@ -34,28 +34,16 @@ public class CategoryPlotReportDataContentPane extends AbstractReportDataContent
 
     public CategoryPlotReportDataContentPane(ChartDataPane parent) {
         initEveryPane();
-<<<<<<< HEAD
         categoryName = initCategoryBox(Toolkit.i18nText("Fine-Design_Chart_Category_Name"));
         categoryName.setPreferredSize(new Dimension(246,30));
         categoryName.setBorder(BorderFactory.createEmptyBorder(0,24,0,7));
         this.add(categoryName, "0,0,2,0");
-=======
-        categoryName = initCategoryBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category_Name"));
-        categoryName.setPreferredSize(new Dimension(236,30));
-        categoryName.setBorder(BorderFactory.createEmptyBorder(0,24,0,20));
-        this.add(categoryName, "0,0,1,0");
->>>>>>> e4e801e2792ee3f3f6cef022e6c646ff7ec97091
         filterPane = new ChartDataFilterPane(new Bar2DPlot(), parent);
         JPanel panel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(Toolkit.i18nText("Fine-Design_Chart_Data_Filter"),filterPane);
         panel.setBorder(getSidesBorder());
         filterPane.setBorder(getFilterPaneBorder());
-<<<<<<< HEAD
         this.add(panel, "0,6,2,4");    }
 
-=======
-        this.add(panel, "0,6,1,4");    }
-    
->>>>>>> e4e801e2792ee3f3f6cef022e6c646ff7ec97091
 	protected TinyFormulaPane initCategoryBox(final String leftLabel) {
 		TinyFormulaPane categoryName = new TinyFormulaPane() {
             @Override