refactor: refs #6184 Minor changes

modules/ticket/back/methods/ticket/saveSign.js

@@ -137,23 +137,13 @@ module.exports = Self => {
                     throw new UserError('Ticket is already signed');
 
                 if (location) await setLocation(ticketId);
-<<<<<<< HEAD
                 if (!await hasSignDms(ticketId) && !gestDocCreated)
                     await createGestDoc(ticketId);
-=======
-                if (!gestDocCreated) await createGestDoc(ticketId);
->>>>>>> dev
                 await models.TicketDms.create({ticketFk: ticketId, dmsFk: dms[0].id}, myOptions);
                 await ticket.updateAttribute('isSigned', true, myOptions);
 
                 const deliveryState = await models.State.findOne({
-<<<<<<< HEAD
                     where: {code: 'DELIVERED'}
-=======
-                    where: {
-                        code: 'DELIVERED'
-                    }
->>>>>>> dev
                 }, myOptions);
 
                 await models.Ticket.state(ctx, {