Fixx

logicalclocks · Mar 18, 2024 · 1424a37 · 1424a37
1 parent 933c2ad
commit 1424a37
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/files/default/sql/ddl/3.8.0__initial_tables.sql b/files/default/sql/ddl/3.8.0__initial_tables.sql
@@ -1264,12 +1264,7 @@ CREATE TABLE `serving` (
  `kafka_topic_id` int(11) DEFAULT NULL,
  `inference_logging` int(11) DEFAULT NULL,
  `revision` varchar(8) DEFAULT NULL,
-<<<<<<< HEAD
- `predictor_resources` varchar(1000) COLLATE latin1_general_cs DEFAULT NULL,
- `transformer_resources` varchar(1000) COLLATE latin1_general_cs DEFAULT NULL,
  `api_protocol` TINYINT(1) NOT NULL DEFAULT '0',
-=======
->>>>>>> 03d380cc (Support canary serving deployments)
  PRIMARY KEY (`id`),
  UNIQUE KEY `Serving_Constraint` (`project_id`,`name`),
  KEY `user_fk` (`creator`),