chore: solve merge from main

2023-03-23 21:57:46 +08:00
parent 88a8f061b5 d5a0d52b4d
commit d51e8c1a88
11 changed files with 31 additions and 24 deletions
@@ -12,8 +12,10 @@ let prices: Price[] = [
  }
 ];
 const official_dev = `https://dev.voce.chat`;
-// const local_dev = `http://07333.qicp.vip:3030`;
 const local_dev = official_dev;
+
+// const local_dev = `http://07333.qicp.vip:3030`;
+// const local_dev = `https://im.ttt.td`;
 // const local_dev = `http://localhost:3333`;
 export const BASE_ORIGIN = process.env.REACT_APP_RELEASE
  ? `${location.origin}`