diff options
| author | scria1000 <91804886+scria1000@users.noreply.github.com> | 2021-11-27 18:28:49 +0000 |
|---|---|---|
| committer | scria1000 <91804886+scria1000@users.noreply.github.com> | 2021-11-27 18:28:49 +0000 |
| commit | fa772c1d20731b8d474bec78f131dea02b53dd8c (patch) | |
| tree | 95a8a615f717c9662cb0a3af6d9659dbe389a7ec | |
| parent | a399200be2bb7b3580127c6125980e1cdfd386c7 (diff) | |
| download | infinity-for-reddit-fa772c1d20731b8d474bec78f131dea02b53dd8c.tar infinity-for-reddit-fa772c1d20731b8d474bec78f131dea02b53dd8c.tar.gz infinity-for-reddit-fa772c1d20731b8d474bec78f131dea02b53dd8c.tar.bz2 infinity-for-reddit-fa772c1d20731b8d474bec78f131dea02b53dd8c.tar.lz infinity-for-reddit-fa772c1d20731b8d474bec78f131dea02b53dd8c.tar.xz infinity-for-reddit-fa772c1d20731b8d474bec78f131dea02b53dd8c.tar.zst infinity-for-reddit-fa772c1d20731b8d474bec78f131dea02b53dd8c.zip | |
Fix conflict
| -rw-r--r-- | app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostDetailRecyclerViewAdapter.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostDetailRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostDetailRecyclerViewAdapter.java index 853ce598..5ab227a1 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostDetailRecyclerViewAdapter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostDetailRecyclerViewAdapter.java @@ -131,7 +131,6 @@ public class PostDetailRecyclerViewAdapter extends RecyclerView.Adapter<Recycler private static final int VIEW_TYPE_POST_DETAIL_NO_PREVIEW_LINK = 6; private static final int VIEW_TYPE_POST_DETAIL_GALLERY = 7; private static final int VIEW_TYPE_POST_DETAIL_TEXT_TYPE = 8; - private final MarkwonAdapter mMarkwonAdapter; private AppCompatActivity mActivity; private ViewPostDetailFragment mFragment; private Executor mExecutor; |