版本号冲突

79f52116 · fengzhaoyu · 7b283976 · 79f52116
Commit 79f52116 authored Apr 22, 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
@@ -780,11 +780,7 @@ create.Page({
    maxClickCount--;
    if (maxClickCount == 0) {
      dd.alert({
-<<<<<<< HEAD
-        content: "0.0.7"
-=======
        content: "0.0.9"
->>>>>>> dev
      });
      maxClickCount = 5;
    }