Index: openacs-4/packages/acs-kernel/sql/postgresql/acs-install.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/acs-install.sql,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/acs-kernel/sql/postgresql/acs-install.sql	14 Feb 2003 02:47:13 -0000	1.16
+++ openacs-4/packages/acs-kernel/sql/postgresql/acs-install.sql	15 Feb 2003 20:42:03 -0000	1.17
@@ -15,7 +15,6 @@
     main_site_id        site_nodes.node_id%TYPE;
 begin   
 
-<<<<<<< acs-install.sql
   kernel_id := apm_service__new (
                     null,
                     ''ACS Kernel'',
@@ -29,8 +28,6 @@
 
   perform apm_package__enable (kernel_id);
 
-=======
->>>>>>> 1.15
   main_site_id := apm_service__new(
                     null,
 		    ''Main Site'',