Projects >> NotePad >>9b93b539cefa2e9fd30385166da65d80d7754d8b

Chunk
Conflicting content 
import com.nononsenseapps.notepad.NotePad;
import com.nononsenseapps.notepad.sync.SyncAdapter;
<<<<<<< HEAD
import com.nononsenseapps.notepad_donate.R;
=======
import com.nononsenseapps.notepad.widget.ListWidgetProvider;
>>>>>>> a0d443ff0c162f3de774e4b28b038972d8770caf

import android.appwidget.AppWidgetManager;
import android.content.ClipDescription;
Solution content 
import com.nononsenseapps.notepad.NotePad;
import com.nononsenseapps.notepad.sync.SyncAdapter;
import com.nononsenseapps.notepad_donate.R;
import com.nononsenseapps.notepad.widget.ListWidgetProvider;

import android.appwidget.AppWidgetManager;
import android.content.ClipDescription;
File
NotePadProvider.java
Developer's decision
Concatenation
Kind of conflict
Import