Fixed merge conflicts

Frontend/src/components/formatter/XMLButtonFormatterComponent.vue

@@ -5,14 +5,6 @@ const props = defineProps({
     isMinimizer: {type: Boolean}
 })
 
-<<<<<<< HEAD
-const emit = defineEmits(["update:result"])
-
-function process() {
-    var request:Request = prepareRequest();
-    fetchRequest(request).then((data) => {
-        sendProcessedData(data);
-=======
 const emit = defineEmits([
     'update:result',
     'update:error'
@@ -22,7 +14,6 @@ function process() {
     var request:Request = prepareRequest()
     fetchRequest(request).then((data) => {
         sendProcessedData(data)
->>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0
     })
 }
 
@@ -30,57 +21,30 @@ function prepareRequest():Request {
     var request = new Request(prepareURL(), {
         body: prepareRequestBody(),
         method: "POST"
-<<<<<<< HEAD
-    });
-=======
     })
->>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0
     return request
 }
 
 function prepareURL(): string {
-<<<<<<< HEAD
-    var mode = "prettify";
-    if (props.isMinimizer)
-        mode = "minimize";
-    return document.location.protocol + "//" + document.location.hostname + "/libxml/" + mode;
-=======
     var mode = "prettify"
     if (props.isMinimizer)
         mode = "minimize"
     return document.location.protocol + "//" + document.location.hostname + "/libxml/" + mode
->>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0
 }
 
 function prepareRequestBody():string {
     var requestBody = JSON.stringify({
         "data": props.xml,
-<<<<<<< HEAD
-        "process": "N/A",
-        "processor": "libxml",
-        "version": "1.0"
-    });
-    return requestBody;
-=======
         "processorData": "N/A",
         "processor": "libxml",
         "version": "1.0"
     })
     return requestBody
->>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0
 }
 
 async function fetchRequest(request: Request):Promise<JSON> {
     var responseBody = await fetch(request)
     .then(response => response.json())
-<<<<<<< HEAD
-    .then((body) => body);
-    return responseBody;
-}
-
-function sendProcessedData(data: JSON) {
-    emit("update:result", data);
-=======
     .then((body) => {
         emit("update:error", body.status == "ERR")
         return body
@@ -90,7 +54,6 @@ function sendProcessedData(data: JSON) {
 
 function sendProcessedData(data: JSON) {
     emit("update:result", data)
->>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0
 }
 </script>