mirror of
https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git
synced 2025-10-05 13:29:50 +02:00
Fix conflict
This commit is contained in:
@@ -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_NO_PREVIEW_LINK = 6;
|
||||||
private static final int VIEW_TYPE_POST_DETAIL_GALLERY = 7;
|
private static final int VIEW_TYPE_POST_DETAIL_GALLERY = 7;
|
||||||
private static final int VIEW_TYPE_POST_DETAIL_TEXT_TYPE = 8;
|
private static final int VIEW_TYPE_POST_DETAIL_TEXT_TYPE = 8;
|
||||||
private final MarkwonAdapter mMarkwonAdapter;
|
|
||||||
private AppCompatActivity mActivity;
|
private AppCompatActivity mActivity;
|
||||||
private ViewPostDetailFragment mFragment;
|
private ViewPostDetailFragment mFragment;
|
||||||
private Executor mExecutor;
|
private Executor mExecutor;
|
||||||
|
Reference in New Issue
Block a user