任务表配置

s_xls.js

@@ -47,17 +47,10 @@ exports.XlsBack = {
         info: [["ConfProxy", "id"]],
     },
     task: {
-<<<<<<< HEAD
-        desc: [["ConfProxy", "id"]],
-        main: [["ConfProxy", "id"]],
-=======
         desc: [["ConfProxy", "kind"]],
         main: [
             ["ConfProxy", "id"],
             ["mainByNextid", "ConfProxy", "nextid"],
         ],
->>>>>>> 9bcbc83 (任务表配置)
     },
-
-
 };