Projects >> ElectricSleep >>f8d37ddc4e0ccd6e38ad4c3def414115840dc84a

Chunk
Conflicting content
        switch (match) {
        case SLEEP_SESSIONS:
        case SLEEP_SESSIONS_ID:
<<<<<<< HEAD
=======
            resolver.notifyChange(SleepSession.CONTENT_URI, null);
>>>>>>> d2d952e5f3c9254e536708335ded32d7552fc9e6
            resolver.notifyChange(uri, null);
        }
        return count;
Solution content
        switch (match) {
        case SLEEP_SESSIONS:
        case SLEEP_SESSIONS_ID:
            notifyChange(uri);
        }
        return count;
File
ElectricSleepProvider.java
Developer's decision
Manual
Kind of conflict
Method invocation