Projects >> AlarmClock >>0f6d2d42ad5c95885f60f1bbd622ab76095f1809

Chunk
Conflicting content 
import android.os.IBinder;
import android.os.Message;

<<<<<<< HEAD:src/com/premium/alarm/model/AlarmsService.java
=======
import com.better.alarm.model.interfaces.AlarmNotFoundException;
import com.better.alarm.model.interfaces.PresentationToModelIntents;
>>>>>>> 29fc6e834d72271dc791fb1a62b472665f04de17:src/com/better/alarm/model/AlarmsService.java
import com.github.androidutils.logger.Logger;
import com.github.androidutils.wakelock.WakeLockManager;
import com.premium.alarm.model.interfaces.AlarmNotFoundException;
Solution content 
import android.os.IBinder;
import android.os.Message;

import com.github.androidutils.logger.Logger;
import com.github.androidutils.wakelock.WakeLockManager;
import com.premium.alarm.model.interfaces.AlarmNotFoundException;
File
AlarmsService.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
<<<<<<< HEAD:src/com/premium/alarm/presenter/SettingsActivity.java

    @Override
    public boolean onCreateOptionsMenu(Menu menu) {
        getActionBar().setDisplayHomeAsUpEnabled(true);
        MenuItem menuItem = menu.findItem(R.id.menu_share);
        ShareActionProvider sp = (ShareActionProvider) menuItem.getActionProvider();

        Intent intent = new Intent(android.content.Intent.ACTION_SEND);
        intent.setType("text/plain");
        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);

        // Add data to the intent, the receiving app will decide what to do with
        // it.
        intent.putExtra(Intent.EXTRA_SUBJECT, "https://play.google.com/store/apps/details?id=com.premium.alarm");
        intent.putExtra(Intent.EXTRA_TEXT, "https://play.google.com/store/apps/details?id=com.premium.alarm");

        sp.setShareIntent(intent);

        if (Build.VERSION.SDK_INT < JELLY_BEAN_MR1) {
            MenuItem menuItemDashclock = menu.findItem(R.id.menu_dashclock);
            menuItemDashclock.setVisible(false);
        }

=======
>>>>>>> 29fc6e834d72271dc791fb1a62b472665f04de17:src/com/better/alarm/presenter/SettingsActivity.java
        return true;
    }
Solution content 
    @Override
    public boolean onCreateOptionsMenu(Menu menu) {
        getActionBar().setDisplayHomeAsUpEnabled(true);
        return true;
    }
File
SettingsActivity.java
Developer's decision
Version 2
Kind of conflict
Cast expression
Comment
If statement
Method invocation
Variable
Chunk
Conflicting content 
import android.support.v4.app.NotificationCompat;
import android.text.format.DateFormat;

<<<<<<< HEAD:src/com/premium/alarm/presenter/alert/AlarmAlertReceiver.java
=======
import com.better.alarm.R;
import com.better.alarm.model.AlarmsManager;
import com.better.alarm.model.interfaces.Alarm;
import com.better.alarm.model.interfaces.AlarmNotFoundException;
import com.better.alarm.model.interfaces.IAlarmsManager;
import com.better.alarm.model.interfaces.Intents;
import com.better.alarm.model.interfaces.PresentationToModelIntents;
import com.better.alarm.presenter.TransparentActivity;
>>>>>>> 29fc6e834d72271dc791fb1a62b472665f04de17:src/com/better/alarm/presenter/alert/AlarmAlertReceiver.java
import com.github.androidutils.logger.Logger;
import com.premium.alarm.R;
import com.premium.alarm.model.AlarmsManager;
Solution content 
import android.support.v4.app.NotificationCompat;
import android.text.format.DateFormat;

import com.github.androidutils.logger.Logger;
import com.premium.alarm.R;
import com.premium.alarm.model.AlarmsManager;
File
AlarmAlertReceiver.java
Developer's decision
Version 1
Kind of conflict
Import