hmm... think this is right for 1.7

diff --git a/httemplate/edit/process/quick-cust_pkg.cgi b/httemplate/edit/process/quick-cust_pkg.cgi
index 976ab1a..cbc9878 100644 (file)
--- 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 ) %>
 %}