| Chunk |
|---|
| Conflicting content |
|---|
} else {
buf[count - 1] = '\"';
}
<<<<<<< HEAD
=======
>>>>>>> 4d721cb2c05106a375691899aa9d5b2b81987ad4
return;
}
|
| Solution content |
|---|
} else {
buf[count - 1] = '\"';
}
return;
}
|
| File |
|---|
| SerializeWriter.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |