| Chunk |
|---|
| Conflicting content |
|---|
* Different products have different animations when closing windows, and sometimes it might take
* a little while if using an Opera action to close a window.
*/
<<<<<<< HEAD
WINDOW_CLOSE_USING_ACTION_SLEEP(new Duration(10, MILLISECONDS));
private Duration duration;
=======
WINDOW_CLOSE_SLEEP(100),
/**
* The timeout for selftests.
*/
SELFTEST_TIMEOUT(200000);
>>>>>>> 3b03d12c24435c92c2db87e35080a47a66bd520b
private OperaIntervals(Duration duration) {
this.duration = duration; |
| Solution content |
|---|
* Different products have different animations when closing windows, and sometimes it might take
* a little while if using an Opera action to close a window.
*/
WINDOW_CLOSE_USING_ACTION_SLEEP(new Duration(10, MILLISECONDS)),
/**
* The timeout for selftests.
*/
SELFTEST_TIMEOUT(new Duration(200, SECONDS));
private Duration duration;
private OperaIntervals(Duration duration) {
this.duration = duration; |
| File |
|---|
| OperaIntervals.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Attribute |
| Comment |
| Enum value |