| Chunk |
|---|
| Conflicting content |
|---|
// if(i==2) return 4; // else return i; // this is with a single ring! <<<<<<< HEAD return i; ======= return i; >>>>>>> b27fffea51d2755ab52c0d95054f6a4fa79c7617 } /** |
| Solution content |
|---|
// if(i==2) return 4; // else return i; // this is with a single ring! return i; } /** |
| File |
|---|
| EratosthenesCsp3.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Return statement |
| Variable |