From 7936350ede3f54593066bcff6ca9a0e83531249d Mon Sep 17 00:00:00 2001 From: Marijn Jansen Date: Thu, 29 Jun 2017 13:35:49 +0200 Subject: [PATCH] Fix! --- .../java/nl/myhyvesbookplus/tagram/TimeLineAdapter.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimeLineAdapter.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimeLineAdapter.java index 8146347..8282574 100644 --- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimeLineAdapter.java +++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimeLineAdapter.java @@ -8,22 +8,16 @@ import android.view.View; import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.BaseAdapter; -import android.widget.Button; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.TextView; import com.bumptech.glide.Glide; import com.firebase.ui.storage.images.FirebaseImageLoader; -<<<<<<< HEAD import com.google.android.gms.tasks.OnCompleteListener; import com.google.android.gms.tasks.Task; import com.google.firebase.database.DatabaseReference; import com.google.firebase.database.FirebaseDatabase; -======= -import com.google.firebase.auth.FirebaseAuth; -import com.google.firebase.auth.FirebaseUser; ->>>>>>> origin/master import com.google.firebase.storage.FirebaseStorage; import com.google.firebase.storage.StorageReference;