# Conflicts: # apps/desktop/src/components/grid/DataGrid.vue # apps/desktop/src/stores/settingsStore.ts |
||
|---|---|---|
| .. | ||
| app-tests | ||
| cli | ||
| mcp-server | ||
| node-core | ||
# Conflicts: # apps/desktop/src/components/grid/DataGrid.vue # apps/desktop/src/stores/settingsStore.ts |
||
|---|---|---|
| .. | ||
| app-tests | ||
| cli | ||
| mcp-server | ||
| node-core | ||