Projects >> 3729_2012 >>025ea25a4c35e774eda943ac8bd53e78956477bf

Chunk
Conflicting content
            bl.set(bl_out);
            fr.set(fr_out);
            br.set(br_out);
<<<<<<< HEAD
=======
        }
        
        private double clamp(double value, double min, double max) {
            if (value < min) return min;
            else if (value > max) return max;
            return value;
>>>>>>> 449280ebad0782842a82a2723dead74433c0dd2a
        }
}
Solution content
            bl.set(bl_out);
            fr.set(fr_out);
            br.set(br_out);
        }
        
        private double clamp(double value, double min, double max) {
            if (value < min) return min;
            else if (value > max) return max;
            return value;
        }
}
File
Drive.java
Developer's decision
Version 2
Kind of conflict
If statement
Method signature
Return statement
Variable