From f78386da15ff5ef083234c6fcd874e49d7204cbb Mon Sep 17 00:00:00 2001
From: Doug Bell <doug@plainblack.com>
Date: Tue, 13 Jul 2010 13:17:40 -0500
Subject: [PATCH] fix merge

---
 docs/upgrades/upgrade_7.9.8-7.9.9.pl | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/docs/upgrades/upgrade_7.9.8-7.9.9.pl b/docs/upgrades/upgrade_7.9.8-7.9.9.pl
index b08fc464e..2414349a3 100644
--- a/docs/upgrades/upgrade_7.9.8-7.9.9.pl
+++ b/docs/upgrades/upgrade_7.9.8-7.9.9.pl
@@ -32,13 +32,10 @@ my $quiet; # this line required
 my $session = start(); # this line required
 
 # upgrade functions go here
-<<<<<<< HEAD
 addIndexToUserSessionLog($session);
 addHeightToCarousel($session);
 synchronizeUserProfileTables($session);
-=======
 migrateAttachmentsToJson( $session );
->>>>>>> migrate to JsonTable to edit template attachments
 
 finish($session); # this line required