Projects >> Freebloks-Android >>7c36994e3edabe89c4c9649e0577a47149367db5

Chunk
Conflicting content 
package de.saschahlusiak.freebloks.preferences;

import de.saschahlusiak.freebloks.Global;
<<<<<<< HEAD
import de.saschahlusiak.freebloksvip.R;
=======
import de.saschahlusiak.freebloks.R;
import android.app.backup.BackupManager;
>>>>>>> 17bff03b0ff9ff21498ddecb58f9f06b64baf90a
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
Solution content 
package de.saschahlusiak.freebloks.preferences;

import de.saschahlusiak.freebloks.Global;
import de.saschahlusiak.freebloksvip.R;
import android.app.backup.BackupManager;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
File
FreebloksPreferences.java
Developer's decision
Combination
Kind of conflict
Import