fix: merge

2024-10-08 17:10:19 +02:00 · 2024-10-08 17:10:19 +02:00 · 040304d04f
parent 0c6541372e
commit 040304d04f
1 changed files with 0 additions and 3 deletions
--- a/modules/ticket/back/methods/ticket/closure.js
+++ b/modules/ticket/back/methods/ticket/closure.js
@ -155,10 +155,7 @@ module.exports = async function(ctx, Self, tickets, options) {
                INSERT INTO util.debug (variable, value)
                    VALUES ('invoicingTicketError', ?)
            `, [ticket.id + ' - ' + error]);
-<<<<<<< HEAD

-=======
->>>>>>> 087818e39d86256ae1e166112b0f648a7a0ff239
            if (error.responseCode == 450) {
                await invalidEmail(ticket);
                continue;