部分

2019-12-24 16:32:27 +08:00
parent 68a7aea72c
commit f9ef1a34bd
34 changed files with 136 additions and 55 deletions
--- a/pages/undetermined/undetermined.js
+++ b/pages/undetermined/undetermined.js
@@ -1,8 +1,5 @@
 // pages/undetermined/undetermined.js
-<<<<<<< HEAD
 import bin from "../../utils/bin"
-=======
->>>>>>> 260785c6fe0a4997462040f4f8890f1da9a0deb6
 Page({

    /**