pull

cc1db970 · xuzhenghua · 0ca226f0 · cc1db970
Commit cc1db970 authored Dec 16, 2019 by xuzhenghua
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

src/components/activity/newyear-2019/treasure-box/rank.js
+0 -4

No files found.
--- a/src/components/activity/newyear-2019/treasure-box/rank.js
+++ b/src/components/activity/newyear-2019/treasure-box/rank.js
@@ -28,11 +28,7 @@ class TreasureRank extends Component {
              rankList: data,
              isMore: true,
            });
-<<<<<<< HEAD
          }else {
-=======
-          }else if() {
->>>>>>> 0f92790c458fe0a8758cbf45393373c95f25eb0f
            this.setState({
              rank: data,
              rankList: data,