Projects >> df4j >>38a6f580417204a672b8769199c3916f29aead5b

Chunk
Conflicting content 
import static org.junit.Assert.assertTrue;

import java.io.PrintStream;
<<<<<<< HEAD

import org.junit.Test;

import com.github.rfqu.df4j.core.Actor;
import com.github.rfqu.df4j.ext.Demux;
=======
import java.util.concurrent.LinkedBlockingQueue;

import org.junit.Test;

import com.github.rfqu.df4j.core.AbstractActor;
import com.github.rfqu.df4j.core.Actor;
>>>>>>> cd6c9123b21f1d362d03d986faa2a026eb7cab21
import com.github.rfqu.df4j.util.IntValue;

/**
Solution content 
import static org.junit.Assert.assertTrue;

import java.io.PrintStream;
<<<<<<< HEAD

import org.junit.Test;

import com.github.rfqu.df4j.core.Actor;
import com.github.rfqu.df4j.ext.Demux;
=======
import java.util.concurrent.LinkedBlockingQueue;

import org.junit.Test;

import com.github.rfqu.df4j.core.AbstractActor;
import com.github.rfqu.df4j.core.Actor;
>>>>>>> github/work
import com.github.rfqu.df4j.util.IntValue;

/**
File
DemuxTest.java
Developer's decision
Manual
Kind of conflict
Import