fix merge conflicts in migrations

HubSpot · Oct 17, 2016 · 1d78cf5 · 1d78cf5
2 parents 151f1af + 17575a6
commit 1d78cf5
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/mysql/migrations.sql b/mysql/migrations.sql
@@ -112,7 +112,10 @@ ALTER TABLE `taskHistory`
 --changeset ssalinas:13 dbms:mysql
 ALTER TABLE `deployHistory` MODIFY `bytes` MEDIUMBLOB NOT NULL;
 
---changeset ssalinas:14 dbms:mysql
+--changeset tpetr:14 dbms:mysql
+ALTER TABLE `requestHistory` MODIFY `createdAt` TIMESTAMP(3) NOT NULL DEFAULT '1971-01-01 00:00:01'
+
+--changeset ssalinas:15 dbms:mysql
 ALTER TABLE `taskHistory`
   ADD COLUMN `purged` BOOLEAN NOT NULL DEFAULT false,
   ADD KEY `purged` (`requestId`, `purged`, `updatedAt`);