Projects >> Arrows-and-Circles >>c311c08facc5e25ef974fb5471769181514d526a

Chunk
Conflicting content 
            }
        });

<<<<<<< HEAD
        _rewindBtn.setFont(new java.awt.Font("Bitstream Vera Sans", 0, 7));
        _rewindBtn.setText("PLAY");
=======
        _rewindBtn.setFont(new java.awt.Font("Bitstream Vera Sans", 0, 10)); // NOI18N
        _rewindBtn.setText("RW");
>>>>>>> 9350a5576fc9bcb4406f6771bbb76aa1c6a181d3
        _rewindBtn.addActionListener(new java.awt.event.ActionListener() {
            public void actionPerformed(java.awt.event.ActionEvent evt) {
                _rewindBtnActionPerformed(evt);
Solution content 
            }
        });

        _rewindBtn.setFont(new java.awt.Font("Bitstream Vera Sans", 0, 10)); // NOI18N
        _rewindBtn.setText("RW");
        _rewindBtn.addActionListener(new java.awt.event.ActionListener() {
            public void actionPerformed(java.awt.event.ActionEvent evt) {
                _rewindBtnActionPerformed(evt);
File
MainFrame.java
Developer's decision
Version 2
Kind of conflict
Comment
Method invocation