保存

620392c2 · wangshuo · be4ae64d · 620392c2
Commit 620392c2 authored Oct 31, 2019 by wangshuo
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

src/components/blessingPreheat/index.js
+0 -3

No files found.
--- a/src/components/blessingPreheat/index.js
+++ b/src/components/blessingPreheat/index.js
@@ -299,12 +299,9 @@ class BlessingPreheat extends Component {
          handleToShowInvite={this.handleToShowInvite}
          handleToShowNotice={this.handleToShowNotice}
          handleToShow={this.handleToShow}
-<<<<<<< HEAD
          toLogin={this.toLogin}
-=======
          handleToShowShare={() => this.handleToShow('shareMark')}
          handleToHideShare={() => this.handleToHide('shareMark')}
->>>>>>> e0942347f218f3988bbb48b28803a470a0fbcec1
        />

        {/* 幸运大抽奖--预热 */}