fix conflit

f43ac61c · fengzhaoyu · 632bc604 · f43ac61c
Commit f43ac61c authored Apr 21, 2020 by fengzhaoyu
Show whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

index.js pages/index/index.js +1 -1

No files found.
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -782,7 +782,7 @@ create.Page({
    maxClickCount--;
    if (maxClickCount == 0) {
      dd.alert({
-        content: "版本号222"
+        content: "0.0.5"
      });
      maxClickCount = 5;
    }