Skip to content

D
design
Commit 20b9684d by Lee Munkyeong
Options

Conflict対応

parent 50e2553c
Showing with 0 additions and 2 deletions
app/script/check.js
......@@ -2857,5 +2857,4 @@ CHK.changeOperationGroupMaster = function(operationGroupMasterId) {
CHK.operationGroupMasterId = operationGroupMasterId;
CHK.createCategory(CHK.operationGroupMaster.operationGroupMasterList);
CHK.search();
>>>>>>> b490414db771026a829ef8f0183adfbe52b262fd
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment