# Conflicts: # src/store/modules/project.js # src/views/Editor/dialogs/editors/CustomModuleEditor.vue
rockyl authored