| Chunk |
|---|
| Conflicting content |
|---|
/**
* Current version of this SDK.
*/
<<<<<<< HEAD
public static final String SDK_VERSION = "2.2.0.unstable";
=======
public static final String SDK_VERSION = "2.1.1";
>>>>>>> da6dbef8e60087c15ee4bc9d1c0460e9338f43b2
/**
* Last phone version. |
| Solution content |
|---|
/**
* Current version of this SDK.
*/
public static final String SDK_VERSION = "2.2.0.unstable";
/**
* Last phone version. |
| File |
|---|
| SalesforceSDKManager.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |