From 52cf328cb18c3062e91b5acb7da14d50be90c9f1 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 29 Mar 2008 08:05:17 +0000
Subject: hmm... think this is right for 1.7

---
 httemplate/edit/process/quick-cust_pkg.cgi | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/httemplate/edit/process/quick-cust_pkg.cgi b/httemplate/edit/process/quick-cust_pkg.cgi
index 976ab1aae..cbc9878e8 100644
--- a/httemplate/edit/process/quick-cust_pkg.cgi
+++ b/httemplate/edit/process/quick-cust_pkg.cgi
@@ -1,10 +1,5 @@
 %if ($error) {
-<<<<<<< quick-cust_pkg.cgi
-%  $cgi->param('error', $error);
-<% $cgi->redirect(popurl(3). 'misc/order_pkg.html?'. $cgi->query_string ) %>
-=======
 %  errorpage($error);
->>>>>>> 1.9.2.3
 %} else {
 <% $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum#cust_pkg". $cust_pkg[0]->pkgnum ) %>
 %}
-- 
cgit v1.2.1