From 67cc942bfd3745a9e5fbd9261cfe3a948c348675 Mon Sep 17 00:00:00 2001 From: caserKing Date: Thu, 29 Aug 2019 13:01:08 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=A4=A7=E5=B1=8F=E3=80=91=E3=80=90?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8F=90=E4=BA=A4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.js | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/App.js b/App.js index 5e19028..f64be33 100644 --- a/App.js +++ b/App.js @@ -736,7 +736,6 @@ getAdView(){ 公众号 {this.state.versionInfo} -<<<<<<< Updated upstream */ @@ -754,28 +753,6 @@ getAdView(){ loop={true} autoplayInterval={5000} /> -======= - - - ); - } else if (this.state.adType == 1) { - return( - - - ->>>>>>> Stashed changes ) } }