server_form: Added autocomplete function to url.

Autocompletes when the user passes only org url,
in the server url input.

Fixes zulip#1012

Author: manila

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;