Update cowjump.java

Author: raymo

cowjump.java

@@ -84,6 +84,7 @@ public static void main(String[] args) throws IOException{
 			StringTokenizer st = new StringTokenizer(f.readLine());
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
 			Point a = new Point(Integer.parseInt(st.nextToken()), Integer.parseInt(st.nextToken()));
 			Point b = new Point(Integer.parseInt(st.nextToken()), Integer.parseInt(st.nextToken()));
@@ -115,6 +116,8 @@ public static void main(String[] args) throws IOException{
 =======
 >>>>>>> parent of c6da410... Long Proofing
 =======
+>>>>>>> parent of c6da410... Long Proofing
+=======
 >>>>>>> parent of c6da410... Long Proofing
 			a = new Point(Integer.parseInt(st.nextToken()),Integer.parseInt(st.nextToken()));
 			b = new Point(Integer.parseInt(st.nextToken()),Integer.parseInt(st.nextToken()));
@@ -209,6 +212,9 @@ class Point implements Comparable<Point>{
 	int index = -1; 
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> parent of c6da410... Long Proofing
+=======
 >>>>>>> parent of c6da410... Long Proofing
 =======
 >>>>>>> parent of c6da410... Long Proofing
@@ -358,6 +364,7 @@ public double atX(double x) {
 	}
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
 	public Point atX_(double x) {
 		return new Point(x,this.atX(x));
@@ -366,6 +373,8 @@ public Point atX_(double x) {
 =======
 >>>>>>> parent of c6da410... Long Proofing
 =======
+>>>>>>> parent of c6da410... Long Proofing
+=======
 >>>>>>> parent of c6da410... Long Proofing
 
 	public Point atX_(double x) {