From 72465a3f8315b0710377aabb83efdf23428e8e08 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Wed, 13 May 2009 22:19:07 +0000
Subject: [PATCH] Fix syntax errors in the upgrade script.

---
 docs/upgrades/upgrade_7.7.5-7.7.6.pl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/upgrades/upgrade_7.7.5-7.7.6.pl b/docs/upgrades/upgrade_7.7.5-7.7.6.pl
index c9a213b6b..5d78c676f 100644
--- a/docs/upgrades/upgrade_7.7.5-7.7.6.pl
+++ b/docs/upgrades/upgrade_7.7.5-7.7.6.pl
@@ -166,7 +166,6 @@ sub installNotificationsSettings {
     $session->setting->add('inboxNotificationTemplateId', 'b1316COmd9xRv4fCI3LLGA');
 }
 
-<<<<<<< .mine
 sub installSMSUserProfileFields {
     my $session = shift;
     WebGUI::ProfileField->create(