# Conflicts: # designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java # designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java