# Conflicts: # build.gradle # designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java # designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java # designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java # designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java # designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java # designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java # designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java # designer-base/src/main/java/com/fr/design/utils/TemplateUtils.java # designer-base/src/main/java/com/fr/start/server/FineEmbedServer.java # designer-realize/src/main/java/com/fr/design/mainframe/InformationCollector.java # designer-realize/src/main/java/com/fr/design/report/ReportEnginePane.java # designer-realize/src/main/java/com/fr/start/SplashContext.java # designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceActivator.java # designer-realize/src/main/java/com/fr/start/module/optimized/DesignerPluginActivator.java
