| Chunk |
|---|
| Conflicting content |
|---|
//val = -val; sign = -1; } <<<<<<< HEAD for (i=0; i |
| Solution content |
|---|
//val = -val; sign = -1; } for (i=0; i |
| File |
|---|
| Dbg.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |
| For statement |
| Chunk |
|---|
| Conflicting content |
|---|
val /= 10;
if (val==0) break;
}
<<<<<<< HEAD
for (val=i; val>=0; --val) { //@WCA loop<=32
=======
for (val=i; val>=0; --val) { // @WCA loop<=10
>>>>>>> 787e8e16bdebba991ba0c0f2cbfda14bcc5fc556
wr((char) tmp[val]);
}
wr(' '); |
| Solution content |
|---|
val /= 10;
if (val==0) break;
}
for (val=i; val>=0; --val) { // @WCA loop<=10
wr((char) tmp[val]);
}
wr(' '); |
| File |
|---|
| Dbg.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |
| For statement |