From df39cd5ab43441ec41da0aaf5efeaa1c54a3ab8d Mon Sep 17 00:00:00 2001 From: Dante Date: Mon, 20 Apr 2015 11:16:45 -0400 Subject: [PATCH] confflict correction in insert part 2 --- workflow/engine/data/mysql/insert.sql | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index 558cb0df4..fbb333b5e 100644 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -59976,7 +59976,11 @@ INSERT INTO CATALOG (CAT_UID, CAT_LABEL_ID, CAT_TYPE, CAT_FLAG, CAT_OBSERVATION, ('400','ID_YEAR','PERIODICITY','','','2015-03-04','2015-03-04'), ('1010','ID_PROCESS_EFFICIENCE','INDICATOR','','','2015-03-04','2015-03-04'), ('1030','ID_EMPLYEE_EFFICIENCIE','INDICATOR','','','2015-03-04','2015-03-04'), +('1040','ID_USER_INEFFICIENCE','INDICATOR','','','2015-03-04','2015-03-04'), ('1050','ID_OVER_DUE','INDICATOR','%','Unit for displaying','2015-03-04','2015-03-04'), +('1060','ID_NEW_CASES','INDICATOR','','','2015-03-04','2015-03-04'), +('1070','ID_COMPLETED_CASES','INDICATOR','','','2015-03-04','2015-03-04'), +('1080','ID_WORKING_CASES','INDICATOR','','','2015-03-04','2015-03-04'); INSERT INTO ADDONS_MANAGER (ADDON_DESCRIPTION,ADDON_ID,ADDON_NAME,ADDON_NICK,ADDON_PUBLISHER,ADDON_RELEASE_TYPE,ADDON_STATUS,STORE_ID,ADDON_TYPE,ADDON_DOWNLOAD_URL,ADDON_VERSION,ADDON_DOWNLOAD_PROGRESS) VALUES ('Enables de Actions By Email feature.','actionsByEmail','actionsByEmail','actionsByEmail','Colosa','localRegistry','ready','00000000000000000000000000010004','features','','','0'),