solving conflicts

This commit is contained in:
marcelo.cuiza
2015-06-25 15:59:34 -04:00
parent 0fb6241bd9
commit 5180199058
6 changed files with 166 additions and 29 deletions

View File

@@ -2830,7 +2830,6 @@ CREATE TABLE `CATALOG`
KEY `indexType`( `CAT_TYPE`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Definitions catalog.';
#-----------------------------------------------------------------------------
#-- TABLE: SCRIPT_TASK
#-----------------------------------------------------------------------------