Fixed the compilation error.

Signed-off-by: Gaurav <gaurav.sahay@in.bosch.com>

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AutoCompleteTextFieldComponent.java

@@ -89,7 +89,6 @@ public class AutoCompleteTextFieldComponent extends HorizontalLayout {
     public void postConstruct() {
         eventBus.subscribe(this);
         new TextFieldSuggestionBox(rsqlValidationOracle, this).extend(queryTextField);
-<<<<<<< HEAD
     }
 
     @PreDestroy
@@ -107,9 +106,6 @@ public class AutoCompleteTextFieldComponent extends HorizontalLayout {
                 validationIcon.setStyleName(SPUIStyleDefinitions.ERROR_ICON);
             }
         }
-=======
-        queryTextField.addShortcutListener(new EnterShortCutListener());
->>>>>>> branch 'feature_rsql_parser_suggestion' of https://github.com/bsinno/hawkbit/
     }
 
     /**