From a2c275ee3e57688e3bb67d3409355355a9dd2bfd Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Mon, 13 Jul 2009 23:21:57 +0000
Subject: [PATCH] Remove early commit of new template code.

---
 docs/upgrades/upgrade_7.7.14-7.7.15.pl | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/docs/upgrades/upgrade_7.7.14-7.7.15.pl b/docs/upgrades/upgrade_7.7.14-7.7.15.pl
index 5a553d251..af168dd4e 100644
--- a/docs/upgrades/upgrade_7.7.14-7.7.15.pl
+++ b/docs/upgrades/upgrade_7.7.14-7.7.15.pl
@@ -22,7 +22,6 @@ use Getopt::Long;
 use WebGUI::Session;
 use WebGUI::Storage;
 use WebGUI::Asset;
-use List::MoreUtils qw/uniq/;
 
 
 my $toVersion = '7.7.15';
@@ -32,7 +31,6 @@ my $quiet; # this line required
 my $session = start(); # this line required
 
 # upgrade functions go here
-replaceUsageOfOldTemplates($session);
 replacePayPalDriver($session);
 
 finish($session); # this line required
@@ -120,8 +118,7 @@ sub replaceUsageOfOldTemplates {
     }
     print "DONE!\n" unless $quiet;
 }
-
-
+>>>>>>> .r11781
 
 # -------------- DO NOT EDIT BELOW THIS LINE --------------------------------