Projects >> Arrows-and-Circles >>35e42e35653e89b9e6f4fa90371be8819de01fb2

Chunk
Conflicting content 
           if (n.getCurrent()) {
               g2.setColor(java.awt.Color.PINK);
           }
<<<<<<< HEAD

           if (n.isStart()) {
                g2.draw(n.getStartSymbol());
           }
=======
>>>>>>> 20fa34fd7dd379c1f01a9796347a198f990a8ffa
           if (n.isEnd()) {
               double newRad = n.getRadius()-4;
               double x = n.getCenter().x;
Solution content 
           if (n.getCurrent()) {
               g2.setColor(java.awt.Color.PINK);
           }

           if (n.isEnd()) {
               double newRad = n.getRadius()-4;
               double x = n.getCenter().x;
File
DrawingPanel.java
Developer's decision
Version 2
Kind of conflict
If statement