debug

web/building_saas/main/js/views/character_content_view.js

@@ -499,15 +499,11 @@ let characterOprObj = {
         }
     },
     save: function (callback) {
-<<<<<<< .mine
         let me = characterOprObj;
         let characterTxt = me.getColData(me.currentCache);
         let txtObj =  {field: 'itemCharacterText', text: characterTxt ? characterTxt : ''};
         pageCCOprObj.updateCharacterContent(pageCCOprObj.currentFindSet, {field: 'itemCharacter', updateArr: me.currentCache}, txtObj, characterOprObj, callback);
 
-
-
-=======
         let selectedNode = projectObj.mainController.tree.selected;
         const setting = projectObj.project.property.addRule !== undefined ? projectObj.project.property.addRule : null;
         pageCCOprObj.setCharacterBySetting(selectedNode, setting);
@@ -515,7 +511,6 @@ let characterOprObj = {
         // let characterTxt = me.getColData(me.currentCache);
         // let txtObj =  {field: 'itemCharacterText', text: characterTxt ? characterTxt : ''};
         // pageCCOprObj.updateCharacterContent(pageCCOprObj.currentFindSet, {field: 'itemCharacter', updateArr: me.currentCache}, txtObj, characterOprObj);
->>>>>>> .theirs
     },
     onEditStart: function (sender, args) {
         let me = characterOprObj;