Projects >> akvo-flow >>7bfede511f570ca1aadb10f0b7a4e9fd086ad600

Chunk
Conflicting content
    // there is no GAE URI for data export / import as this is handled by FLOW services so we use
    // empty strings as placeholders
    DATA_CLEANING("", ""),
<<<<<<< HEAD
    DATA_READ("GET", "/rest/survey_instances"),
    DATA_UPDATE("PUT", "/rest/survey_instances"),
    DATA_DELETE("DELETE", "/rest/survey_instances");
=======
    DATA_READ("DELETE", "/rest/survey_instances"),
    DATA_UPDATE("DELETE", "/rest/survey_instances"),
    DATA_DELETE("DELETE", "/rest/survey_instances"),

    DEVICE_MANAGE("GET", "/rest/devices"),
    CASCADE_MANAGE("GET", "/rest/cascade_resources");
>>>>>>> 23823f83f08c822bb7319edf452cc9219eb9c782

    private final String httpMethod;
    private final String uriPrefix;
Solution content
    // there is no GAE URI for data export / import as this is handled by FLOW services so we use
    // empty strings as placeholders
    DATA_CLEANING("", ""),
    DATA_READ("GET", "/rest/survey_instances"),
    DATA_UPDATE("PUT", "/rest/survey_instances"),
    DATA_DELETE("DELETE", "/rest/survey_instances"),

    DEVICE_MANAGE("GET", "/rest/devices"),
    CASCADE_MANAGE("GET", "/rest/cascade_resources");

    private final String httpMethod;
    private final String uriPrefix;
File
Permission.java
Developer's decision
Combination
Kind of conflict
Enum value