| Chunk |
|---|
| Conflicting content |
|---|
System.out.println("user selected from: " + fromTo[0]);
System.out.println("user selected to: " + fromTo[1]);
//ds.setInterval(fromTo[0], fromTo[1]);
<<<<<<< HEAD
Date from = new Date(fromTo[0].getYear() - 1900, fromTo[0].getMonth(), fromTo[0].getDay());
Date to = new Date(fromTo[1].getYear() - 1900, fromTo[1].getMonth(), fromTo[1].getDay());
=======
Date from = new Date(112, 1, 1);
Date to = new Date(112, 2, 1);
>>>>>>> cbbaa0191c2540c4257bcb667cf9cc5428f92006
System.out.println("From: " + from + " To: " + to);
ds.setInterval(from, to);
|
| Solution content |
|---|
System.out.println("user selected from: " + fromTo[0]);
System.out.println("user selected to: " + fromTo[1]);
//ds.setInterval(fromTo[0], fromTo[1]);
Date from = new Date(fromTo[0].getYear() - 1900, fromTo[0].getMonth(), fromTo[0].getDay());
Date to = new Date(fromTo[1].getYear() - 1900, fromTo[1].getMonth(), fromTo[1].getDay());
System.out.println("From: " + from + " To: " + to);
ds.setInterval(from, to);
|
| File |
|---|
| PlaylistGenerator.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |
| Variable |