From e6d95ec533f25936382a0bec046022521d9d6588 Mon Sep 17 00:00:00 2001
From: daviddelikat <david-delikat@usa.net>
Date: Sun, 4 Oct 2009 05:56:46 -0500
Subject: [PATCH] fixed conflict from previous update

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

diff --git a/docs/upgrades/upgrade_7.8.0-7.8.1.pl b/docs/upgrades/upgrade_7.8.0-7.8.1.pl
index 381264c4f..0d98ad45f 100644
--- a/docs/upgrades/upgrade_7.8.0-7.8.1.pl
+++ b/docs/upgrades/upgrade_7.8.0-7.8.1.pl
@@ -36,11 +36,8 @@ removeOldSubscriptionTables( $session );
 removeOldITransactTables( $session );
 removeSQLFormTables( $session );
 fixBadRevisionDateColumns( $session );
-<<<<<<< HEAD:docs/upgrades/upgrade_7.8.0-7.8.1.pl
 addEMSSubmission( $session );
-=======
 removeImportCruft( $session );
->>>>>>> ad702e908f63d36d79be04054b586044bd3c9ecf:docs/upgrades/upgrade_7.8.0-7.8.1.pl
 
 finish($session); # this line required