X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fprocess%2Fquick-cust_pkg.cgi;h=cbc9878e8e0ae91aa52129a34c2d78abec55d9b9;hb=52cf328cb18c3062e91b5acb7da14d50be90c9f1;hp=976ab1aae1369c775dbadecb61aba7d3824fdf50;hpb=c8aaa6ec6aa116e31e9c981abf3ad95e4862d8e9;p=freeside.git

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 ) %>
 %}