Index: branches/RC/core/install/upgrades.sql
===================================================================
diff -u -N -r11331 -r11332
--- branches/RC/core/install/upgrades.sql	(.../upgrades.sql)	(revision 11331)
+++ branches/RC/core/install/upgrades.sql	(.../upgrades.sql)	(revision 11332)
@@ -995,4 +995,4 @@
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'MailingListQueuePerStep', 10, 'In-Portal', 'in-portal:configure_general');
 
 INSERT INTO ConfigurationAdmin VALUES ('MailingListSendPerStep', 'la_Text_smtp_server', 'la_config_MailingListSendPerStep', 'text', NULL, NULL, 30.10, 0, 0);
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'MailingListSendPerStep', 10, 'In-Portal', 'in-portal:configure_general');>>>>>>> 1.19.2.69
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'MailingListSendPerStep', 10, 'In-Portal', 'in-portal:configure_general');