# Conflicts: # apps/documenteditor/forms/app/controller/ApplicationController.js # apps/documenteditor/main/app/controller/RightMenu.js # apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx |
||
|---|---|---|
| .. | ||
| controller | ||
| view | ||
# Conflicts: # apps/documenteditor/forms/app/controller/ApplicationController.js # apps/documenteditor/main/app/controller/RightMenu.js # apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx |
||
|---|---|---|
| .. | ||
| controller | ||
| view | ||