Fix leftover merge marker in SFTP state

Author: AkarinServer

application/state/useSftpState.ts

@@ -875,7 +875,6 @@ export const useSftpState = (
           const hasKey = !!credentials.privateKey;
           const hasPassword = !!credentials.password;
 
-<<<<<<< Updated upstream
           let sftpId: string | undefined;
           if (hasKey) {
             try {