Projects >> Arrows-and-Circles >>bb8411be1494245b7fd8a661b8555c09fa206117

Chunk
Conflicting content
    private List _sim;
    private ListIterator _iter;
    private Timer _simTimer;
<<<<<<< HEAD
    private EdgeDirection _edgeType;
=======
    private boolean _shift = false;
>>>>>>> 9dcbe823686cd2165d081f9947b5fb0ccd0639e6

    /**
     * Creates new form MainFram
Solution content
    private List _sim;
    private ListIterator _iter;
    private Timer _simTimer;
    private EdgeDirection _edgeType;
    private boolean _shift = false;


    /**
     * Creates new form MainFram
File
MainFrame.java
Developer's decision
Concatenation
Kind of conflict
Attribute