Projects >> 2012-code >>e2912251f897c87828165ca5509d413ec9102a8a

Chunk
Conflicting content 
        feedButt.whenPressed(feedOn);
        feedButt.whenReleased(feedOff);
        shooterButt.whenPressed(shoot);
<<<<<<< HEAD
=======
        goTestButt.whenPressed(goTest);
        
    }
>>>>>>> 8ac11f9ef25c3023d3b60a9a4834654549a9694b
    
    /**
     * gets the speed of the left joystick based on the y-axis position
Solution content 
        feedButt.whenPressed(feedOn);
        feedButt.whenReleased(feedOff);
        shooterButt.whenPressed(shoot);

        goTestButt.whenPressed(goTest);
        
    }

    
    /**
     * gets the speed of the left joystick based on the y-axis position
File
OI.java
Developer's decision
Version 2
Kind of conflict
Method invocation