fix conflit

632bc604 · fengzhaoyu · 835c4216 · 632bc604
Commit 632bc604 authored Apr 21, 2020 by fengzhaoyu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

index.js pages/index/index.js +0 -4

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