mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 04:43:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Resolves merge conflict

Browse source
This commit is contained in:
misaochan 2015-10-28 15:52:09 +13:00
parent 3972ab9fd3
commit 4876501d50
1 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
commons/src/main/java/fr/free/nrw/commons/contributions/ContributionsListAdapter.java
View file

@ -19,7 +19,9 @@ import fr.free.nrw.commons.R;
class ContributionsListAdapter extends CursorAdapter { class ContributionsListAdapter extends CursorAdapter {
private DisplayImageOptions contributionDisplayOptions = Utils.getGenericDisplayOptions().build(); private DisplayImageOptions contributionDisplayOptions = Utils.getGenericDisplayOptions().build();
private Activity activity; private Activity activity;
public ContributionsListAdapter(Activity activity, Cursor c, int flags) { public ContributionsListAdapter(Activity activity, Cursor c, int flags) {