server_form: Added autocomplete function to url.

Autocompletes when the user passes only org url, in the server url input. Fixes zulip#1012
manila · May 6, 2022 · a9cf2cc · a9cf2cc
1 parent c390ca8
commit a9cf2cc
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/app/renderer/js/pages/preference/new-server-form.ts b/app/renderer/js/pages/preference/new-server-form.ts
@@ -56,7 +56,6 @@ export function initNewServerForm({$root, onChange}: NewServerFormProps): void {
     "input.setting-input-value",
   )!;
 
-<<<<<<< HEAD
   async function submitFormHandler(): Promise<void> {
     $saveServerButton.textContent = "Connecting...";
     let serverConf;