From d33429783f617702100490d9ae086ef3d2ca4de5 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Fri, 6 Jul 2012 11:18:16 -0700 Subject: [PATCH] Fixed deploydb --- setup/db/create-schema.sql | 1 - 1 file changed, 1 deletion(-) diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql index 96dc7b9d839..72e40b38e25 100755 --- a/setup/db/create-schema.sql +++ b/setup/db/create-schema.sql @@ -2182,7 +2182,6 @@ CREATE TABLE `cloud`.`netscaler_pod_ref` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -<<<<<<< HEAD CREATE TABLE `cloud`.`vpc` ( `id` bigint unsigned NOT NULL auto_increment COMMENT 'id', `uuid` varchar(40) NOT NULL,