bug

frontend/saas-web/app/view/stock/appropriationInOut/FormPanelController.js

@@ -76,14 +76,10 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                             "dataIndex": "ve_promisedays",
                             "width": 100,
                             xtype: 'numbercolumn',
-<<<<<<< HEAD
-                            align: 'end'
-=======
                             align:'end', 
                             renderer : function(v) {
                                 return Ext.util.Format.number(v, '0');
                             }
->>>>>>> origin/dev
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",