code sync

app/view/payment/detail.ejs

@@ -177,7 +177,6 @@
         auditRptPrintHelper.showPage();
         iniPage();
     });
-<<<<<<< HEAD
     
     function _getAdhocDummyCells(srcCell, rstCells) {
         if (typeof srcCell.path === 'string') {
@@ -196,13 +195,6 @@
                 }
             }
         }
-=======
-
-    function _getAdhocDummyCells(picPath) {
-        const rst = [];
-        //
-        return rst;
->>>>>>> 8d28ec2311a15494a0f6bc4ae5392673406e890c
     }
 
     function downloadPDFReport(pageDataArr, pageSize, rpt_names, signatureRelArr, signatureRelInfo, refRptTplIds, STAGE_AUDIT) {