update

constants/index.js

@@ -2,13 +2,7 @@
 const constants = {
   PAGE_SIZE: 20,
   OPENID_EXPIRE: 300, // 5min
-<<<<<<< HEAD
   ALLOW_GROUP_ROLE: ["Ironman3"],
-=======
-  INTERNAL_REGULATION_CACHE_TTL: 1800, // 30min
-  REPORT_CACHE_TTL: 600, // 10 min
-  ALLOW_GROUP_ROLE: ['Ironman3'] // 允許的 Group 身份
->>>>>>> c96cdf0ebd17f805235c6fa9eecf2ea79ecca19b
 };
 
 module.exports = constants;