| Chunk |
|---|
| Conflicting content |
|---|
public static final int UNDEFINED_ACTION = 9;
public static final int WRONG_PASSWORD = 10;
<<<<<<< HEAD
// Used for UID field to indicate the calling UID.
public static final int UID_SELF = -1;
// Flags for "put" "import" and "generate"
public static final int FLAG_NONE = 0;
=======
// Flags for "put" and "import"
>>>>>>> 6fb172b12eefeea4b565c616a4d0a8d1fb015217
public static final int FLAG_ENCRYPTED = 1;
// States |
| Solution content |
|---|
public static final int UNDEFINED_ACTION = 9;
public static final int WRONG_PASSWORD = 10;
// Used for UID field to indicate the calling UID.
public static final int UID_SELF = -1;
// Flags for "put" "import" and "generate"
public static final int FLAG_NONE = 0;
public static final int FLAG_ENCRYPTED = 1;
// States |
| File |
|---|
| KeyStore.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Comment |