fixed rebase errors

src/plugins/rosterview/modals/add-contact.js

@@ -27,14 +27,6 @@ export default class AddContactModal extends BaseModal {
     }
 
     afterRender () {
-<<<<<<< HEAD:src/plugins/rosterview/modals/add-contact.js
-        if (typeof api.settings.get('xhr_user_search_url') === 'string') {
-            this.initXHRAutoComplete();
-        } else {
-            this.initJIDAutoComplete();
-        }
-    }
-=======
         const jid_input = this.el.querySelector('input[name="jid"]');
         this.el.addEventListener('shown.bs.modal', () => jid_input.focus(), false);
     },
@@ -43,7 +35,6 @@ export default class AddContactModal extends BaseModal {
         return ['apple', 'pear', 'banana'];
         // return [...new Set(_converse.roster.map(i => i.get('gruop')).filter(i => i))];
     },
->>>>>>> a8e66ff20 (commit to be deleted):src/modals/add-contact.js
 
     initJIDAutoComplete () {
         if (!api.settings.get('autocomplete_add_contact')) {

src/plugins/rosterview/utils.js

@@ -1,10 +1,4 @@
-<<<<<<< HEAD
-import log from "@converse/headless/log";
-import { __ } from 'i18n';
-import { _converse, api } from "@converse/headless/core";
-=======
 import { _converse, api, converse } from "@converse/headless/core";
->>>>>>> a8e66ff20 (commit to be deleted)
 
 export function removeContact (contact) {
     contact.removeFromRoster(

src/shared/autocomplete/component.js

@@ -48,12 +48,8 @@ export default class AutoCompleteComponent extends CustomElement {
             'getAutoCompleteList': { type: Function },
             'list': { type: Array },
             'auto_evaluate': { type: Boolean },
-<<<<<<< HEAD
-            'auto_first': { type: Boolean },
-=======
             'dataMap': { type: Function },
             'auto_first': { type: Boolean }, // Should the first element be automatically selected?
->>>>>>> a8e66ff20 (commit to be deleted)
             'filter': { type: String },
             'include_triggers': { type: String },
             'min_chars': { type: Number },
@@ -70,12 +66,8 @@ export default class AutoCompleteComponent extends CustomElement {
         this.auto_evaluate = true;
         this.auto_first = false;
         this.filter = 'contains';
-<<<<<<< HEAD
-        this.include_triggers = '';
-=======
         this.dataMap = a => a; // Function that maps user provided input to a suggestion value
         this.include_triggers = ''; // Space separated chars which should be included in the returned value
->>>>>>> a8e66ff20 (commit to be deleted)
         this.match_current_word = false; // Match only the current word, otherwise all input is matched
         this.max_items = 10;
         this.min_chars = 1;
@@ -115,12 +107,8 @@ export default class AutoCompleteComponent extends CustomElement {
             'auto_first': this.auto_first,
             'filter': this.filter == 'contains' ? FILTER_CONTAINS : FILTER_STARTSWITH,
             'include_triggers': [],
-<<<<<<< HEAD
-            'list': this.list ?? ((q) => this.getAutoCompleteList(q)),
-=======
             'list': () => this.getAutoCompleteList(),
             'data': (a) => this.dataMap(a),
->>>>>>> a8e66ff20 (commit to be deleted)
             'match_current_word': true,
             'max_items': this.max_items,
             'min_chars': this.min_chars,