| Chunk |
|---|
| Conflicting content |
|---|
/*********************************************
* Methods
*********************************************/
<<<<<<< HEAD
=======
>>>>>>> bacda1d21b81db9ab7796bf3456976e14bf32de4
// Username Methods
public String getUsername(String ptuId) {
Intervention intervention = getIntervention(ptuId); |
| Solution content |
|---|
/*********************************************
* Methods
*********************************************/
// Username Methods
public String getUsername(String ptuId) {
Intervention intervention = getIntervention(ptuId); |
| File |
|---|
| AudioSettings.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |