Projects >> Team467-FRC-Robot-Code >>09667f1d78cc0ec2b89bb2349dfd3a8ac89abce4

Chunk
Conflicting content
        marginBorder(graphPanelContainer, 10, 10, 10, 5);


<<<<<<< HEAD
        userInterfaceContainter = new JPanel();
        userInterfaceContainter.setLayout(new BoxLayout(userInterfaceContainter, WIDTH));
=======
        userInterfaceContainer = new JPanel();
        userInterfaceContainer.setLayout(new BoxLayout(userInterfaceContainer, WIDTH));
>>>>>>> b5205c219841ea2c3ddc34ea0e663a1f09f1385e

        controlPanel = new JPanel();
        outputPanel = new JPanel();
Solution content
        marginBorder(graphPanelContainer, 10, 10, 10, 5);

        userInterfaceContainer = new JPanel();
        userInterfaceContainer.setLayout(new BoxLayout(userInterfaceContainer, WIDTH));
        controlPanel = new JPanel();
        outputPanel = new JPanel();
File
NewFrame.java
Developer's decision
Version 2
Kind of conflict
Attribute
Method invocation