Projects >> overthere >>3a718cbc7b35e75bdf62b8fbc6a8f227f7132609

Chunk
Conflicting content
 */
class SshScpFile extends SshFile {

<<<<<<< HEAD
    private static final String PERMISSIONS_TOKEN_PATTERN = "[d\\-]([r\\-][w\\-][xst\\-]){3}\\@?";
    private static final Predicate NOT_SELF_OR_PARENT_DIR = Predicates.not(Predicates.or(equalTo("."), equalTo("..")));
=======
    private static final String PERMISSIONS_TOKEN_PATTERN = "[d\\-]([r\\-][w\\-][xst\\-]){3}[\\@\\.\\+]*";
>>>>>>> a004e8960b501421fc049e9d95d1d6aab5e5d42a

    private static Pattern permissionsTokenPattern = Pattern.compile(PERMISSIONS_TOKEN_PATTERN);
Solution content
 */
class SshScpFile extends SshFile {

    private static final Predicate NOT_SELF_OR_PARENT_DIR = Predicates.not(Predicates.or(equalTo("."), equalTo("..")));

    private static final String PERMISSIONS_TOKEN_PATTERN = "[d\\-]([r\\-][w\\-][xst\\-]){3}[\\@\\.\\+]*";

    private static Pattern permissionsTokenPattern = Pattern.compile(PERMISSIONS_TOKEN_PATTERN);
File
SshScpFile.java
Developer's decision
Combination
Kind of conflict
Attribute
Method invocation