25f4ba7b3c
# Conflicts: # apps/desktop/electron/connection-config.test.ts # apps/desktop/electron/connection-config.ts # apps/desktop/electron/main.ts