From fd730a048d132314b54a7e92f85eccab7cb06d56 Mon Sep 17 00:00:00 2001 From: nvazquez Date: Sun, 11 May 2025 21:03:35 -0300 Subject: [PATCH] Fix merge error --- .../src/main/resources/META-INF/db/schema-42010to42100.sql | 2 -- 1 file changed, 2 deletions(-) diff --git a/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql b/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql index 6f685f25a2b..1a303c9576b 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql @@ -38,8 +38,6 @@ WHERE rp.rule = 'quotaStatement' CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.host', 'last_mgmt_server_id', 'bigint unsigned DEFAULT NULL COMMENT "last management server this host is connected to" AFTER `mgmt_server_id`'); -<<<<<<< HEAD - ----------------------------------------------------------- -- CKS Enhancements: -----------------------------------------------------------