| Chunk |
|---|
| Conflicting content |
|---|
private static final int AUTH_TOKEN_OR_SIGNING_SECRET_LENGTH = 32; /** The Constant VERSION. */ <<<<<<< HEAD private static final String VERSION = "6.1.0-edge"; ======= private static final String VERSION = "5.9.0"; >>>>>>> c49f3d6bb74742324b165cbbf5d6bd18bb1888f7 /** The endpoint. */ private String endpoint = "https://api.twilio.com"; |
| Solution content |
|---|
private static final int AUTH_TOKEN_OR_SIGNING_SECRET_LENGTH = 32; /** The Constant VERSION. */ private static final String VERSION = "6.1.0-edge"; /** The endpoint. */ private String endpoint = "https://api.twilio.com"; |
| File |
|---|
| TwilioClient.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |