merge

frontend/saas-web/app/view/document/product/FormPanel.js

@@ -204,14 +204,8 @@ Ext.define('saas.view.document.product.FormPanel', {
         detnoColumn: 'pd_detno',
         showCount: false,
         allowEmpty:true,
-<<<<<<< HEAD
-        deleteDetailUrl:'/api/document/customer/delete/',
-        columns : [
-        {
-=======
         deleteDetailUrl:'/api/document/product/deleteDetail/',
         columns : [{
->>>>>>> 645d12d7420ef944a60d67942f6e0e4f9e15824a
             text : "ID", 
             dataIndex : "id", 
             hidden : true,