verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

solved conflits
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Vicent Llopis 2022-11-02 14:23:35 +01:00
parent 6df74facdc
commit 04f165d901
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
db/dump/fixtures.sql
View File

@ -2715,7 +2715,6 @@ UPDATE `account`.`user`
SET `hasGrant` = 1
WHERE `id` = 66;
<<<<<<< HEAD
INSERT INTO `postgresql`.`journey` (`journey_id`, `day_id`, `start`, `end`, `business_id`)
VALUES
(1, 1, '09:00:00', '13:00:00', 18),
@ -2730,8 +2729,6 @@ VALUES
(10, 4, '07:00:00', '14:00:00', 19),
(11, 5, '08:00:00', '13:00:00', 19);
=======
INSERT INTO `vn`.`osTicketConfig` (`id`, `host`, `user`, `password`, `oldStatus`, `newStatusId`, `day`, `comment`, `hostDb`, `userDb`, `passwordDb`, `portDb`, `responseType`, `fromEmailId`, `replyTo`)
VALUES
(0, 'http://localhost:56596/scp', 'ostadmin', 'Admin1', 'open', 3, 60, 'Este CAU se ha cerrado automáticamente. Si el problema persiste responda a este mensaje.', 'localhost', 'osticket', 'osticket', 40003, 'reply', 1, 'all');
>>>>>>> 6ed5ef7d1b79034791af9ecba79ecb9e3194b1ee