Projects >> mixpanel-android >>018dab6f6d1557b6fe4c4e3783a425fc3beaf968

Chunk
Conflicting content 
    }

    private Result runDecideCheck(final String token, final String distinctId, final ServerMessage poster)
<<<<<<< HEAD
        throws ServiceUnavailableException, UnintelligibleMessageException {
=======
            throws UnintelligibleMessageException {
>>>>>>> c3c60d7ed09cf596508dcec5034e4b6880fe7bd0
        final String responseString = getDecideResponseFromServer(token, distinctId, poster);
        if (MPConfig.DEBUG) {
            Log.v(LOGTAG, "Mixpanel decide server response was:\n" + responseString);
Solution content 
    }

    private Result runDecideCheck(final String token, final String distinctId, final ServerMessage poster)
        throws ServiceUnavailableException, UnintelligibleMessageException {
        final String responseString = getDecideResponseFromServer(token, distinctId, poster);
        if (MPConfig.DEBUG) {
            Log.v(LOGTAG, "Mixpanel decide server response was:\n" + responseString);
File
DecideChecker.java
Developer's decision
Version 1
Kind of conflict
Other