Projects >> TanitaScale >>38932af8e4efeae35b2c450529e85ca3c0b5307f

Chunk
Conflicting content 
package ca.charland.tanita;

import ca.charland.R;
<<<<<<< HEAD
import ca.charland.activity.manage.BasePersonHomeActivity;
=======
import ca.charland.activity.manage.BaseFirstActivity;
import ca.charland.activity.manage.PersonHomeActivity;
>>>>>>> 8ace915a31c8eda8290e8f7c6f30c1bec02b9a92
import ca.charland.activity.manage.PreferencesActivity;
import ca.charland.tanita.db.TanitaDataTable;
import ca.charland.tanita.manage.FirstActivity;
Solution content 
package ca.charland.tanita;

import ca.charland.R;
<<<<<<< HEAD
import ca.charland.activity.manage.BasePersonHomeActivity;
=======
import ca.charland.activity.manage.BaseFirstActivity;
import ca.charland.activity.manage.PersonHomeActivity;
>>>>>>> 8ace915a31c8eda8290e8f7c6f30c1bec02b9a92
import ca.charland.activity.manage.PreferencesActivity;
import ca.charland.tanita.db.TanitaDataTable;
import ca.charland.tanita.manage.FirstActivity;
File
PhysicRatingActivity.java
Developer's decision
Manual
Kind of conflict
Import