mirror of
https://github.com/nextcloud/android.git
synced 2024-11-26 15:15:51 +03:00
fix conflicts
This commit is contained in:
parent
dde82c75c6
commit
be94b5663c
1 changed files with 1 additions and 0 deletions
|
@ -57,6 +57,7 @@ public class AuthenticatorActivityTest {
|
|||
public static final String EXTRA_ACTION = "ACTION";
|
||||
public static final String EXTRA_ACCOUNT = "ACCOUNT";
|
||||
|
||||
|
||||
private int mResultCode = -2;
|
||||
private int WAIT_LOGIN = 5000;
|
||||
|
||||
|
|
Loading…
Reference in a new issue