| Chunk |
|---|
| Conflicting content |
|---|
import com.github.rfqu.df4j.core.Actor; import com.github.rfqu.df4j.core.CallbackFuture; import com.github.rfqu.df4j.ext.Timer; <<<<<<< HEAD import com.github.rfqu.df4j.testutil.DoubleValue; ======= import com.github.rfqu.df4j.util.DoubleValue; import com.github.rfqu.df4j.util.JavaAppLauncher; >>>>>>> a19c178f2dfb9ee3ec7f0f77445f233a4162d537 /** * When launched as a Junit test suite, requires com.github.rfqu.df4j.ioexample.EchoServer |
| Solution content |
|---|
import com.github.rfqu.df4j.core.Actor; import com.github.rfqu.df4j.core.CallbackFuture; import com.github.rfqu.df4j.ext.Timer; import com.github.rfqu.df4j.testutil.DoubleValue; /** |
| File |
|---|
| EchoServerGlobTest.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
/** <<<<<<< HEAD * Echo server, connections are represented as pair of IOHandlers. ======= * Echo server, server-side connection represented as pair of IOHandlers. >>>>>>> a19c178f2dfb9ee3ec7f0f77445f233a4162d537 */ package com.github.rfqu.df4j.nio2.echo; |
| Solution content |
|---|
/** * Echo server, connections are represented as pair of IOHandlers. */ package com.github.rfqu.df4j.nio2.echo; |
| File |
|---|
| package-info.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |