Merge branch 'master' of ssh://server.baseware.net:2222/CL-Softwares/dbSchema

model/ddl_0_component_type.sql

@@ -1,14 +1,8 @@
 -- standard component type 
 
-<<<<<<< HEAD
 DROP TABLE IF EXISTS PUBLIC.COMPONENT_TYPE;
 
 CREATE TABLE PUBLIC.COMPONENT_TYPE (
-=======
-DROP TABLE IF EXISTS COMPONENT_TYPE;
-
-CREATE TABLE COMPONENT_TYPE (
->>>>>>> dd3c6eb (add and update)
     ID SERIAL PRIMARY KEY,
     TYPE VARCHAR(64) NOT NULL DEFAULT '',
     NAME VARCHAR(64) NOT NULL DEFAULT ''