fix to compile

2017-12-15 10:26:27 +08:00
parent f704a29b38
commit 765b4c3afa
6 changed files with 55 additions and 59 deletions
--- a/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/gamedetail/FuLiAdapter.java
@ -48,11 +48,6 @@ import com.lightgame.adapter.BaseRecyclerAdapter;
 import org.greenrobot.eventbus.EventBus;

 import java.util.ArrayList;
-<<<<<<< HEAD
-import java.util.HashMap;
-=======
-import java.util.Calendar;
->>>>>>> origin/3.1
 import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;