Projects >> Pocket-Books-Pro >>03c61a0aec34b4a835ba48aad724ee80f1a07c2c

Chunk
Conflicting content 
package com.happyrobotics.pocketbookspro;

import java.math.BigDecimal;
<<<<<<< HEAD:src/com/happyrobotics/pocketbookspro/AccountsActivity.java

import com.pocketbooks.R;

=======
>>>>>>> a305210d414982a638195e87448b901a8624c24c:src/com/pocketbooks/AccountsActivity.java
import android.app.Activity;
import android.content.Intent;
import android.content.SharedPreferences;
Solution content 
package com.happyrobotics.pocketbookspro;



import java.math.BigDecimal;

import com.pocketbooks.R;

import android.app.Activity;
import android.content.Intent;
import android.content.SharedPreferences;
File
AccountsActivity.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
package com.happyrobotics.pocketbookspro;

import java.math.BigDecimal;
<<<<<<< HEAD:src/com/happyrobotics/pocketbookspro/TransactionsActivity.java

import com.pocketbooks.R;


=======
>>>>>>> a305210d414982a638195e87448b901a8624c24c:src/com/pocketbooks/TransactionsActivity.java
import android.app.Activity;
import android.content.Intent;
import android.content.SharedPreferences;
Solution content 
package com.happyrobotics.pocketbookspro;

import java.math.BigDecimal;

import com.pocketbooks.R;


import android.app.Activity;
import android.content.Intent;
import android.content.SharedPreferences;
File
TransactionsActivity.java
Developer's decision
Version 1
Kind of conflict
Import