package ru.job4j;

public class Max {
	
<<<<<<< HEAD
	public int max(int first, int second) {
=======
		public int max(int first, int second) {
>>>>>>> a0116ba5fe9ed205ea0c6d82478b8f896eba1b54
		
		int max = 0;		
		(first > second) ? max = first : max = second;
		return max;
		
	}
	
	public int max(int first, int second, int third) {
		
		(third > max) ? max = third : max = max;
		return max;
		
	}
	
	
	
	
}

@@ -37,160 +37,54 @@
 %7B%0A%09%0A
-%3C%3C%3C%3C%3C%3C%3C HEAD%0A%09public int max(int first, int second) %7B%0A=======%0A%09%09public int max(int first, int second) %7B%0A%3E%3E%3E%3E%3E%3E%3E a0116ba5fe9ed205ea0c6d82478b8f896eba1b54
+%0A%09%0A%0A%09%09public int max(int first, int second) %7B%0A
 %0A%09%09%0A

Update Max.java