| Chunk |
|---|
| Conflicting content |
|---|
import java.util.*; <<<<<<< HEAD import android.util.Log; ======= >>>>>>> 0855828d9066d568a0d49341e1d62d41d4978ad9 /** * Kodad av: Magnus S/Markus O |
| Solution content |
|---|
import java.util.*; import android.util.Log; /** * Kodad av: Magnus S/Markus O |
| File |
|---|
| Group.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
userList.add(a);
db.accept(a, this);
}
<<<<<<< HEAD
=======
>>>>>>> 0855828d9066d568a0d49341e1d62d41d4978ad9
public void removeUser(User a){
userList.remove(a);
db.unaccept(a, this); |
| Solution content |
|---|
userList.add(a);
db.accept(a, this);
}
public void removeUser(User a){
userList.remove(a);
db.unaccept(a, this); |
| File |
|---|
| Group.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |