From 243088fac52b3f0b3aabe4146cce1cc7bba8d9c7 Mon Sep 17 00:00:00 2001
From: "M.Scholz" <m.scholz88@onlinehome.de>
Date: Wed, 21 Nov 2012 10:51:07 +0100
Subject: [PATCH] merge

---
 ws2012/P2P/uebungen/4/src/peer/Node.java | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/ws2012/P2P/uebungen/4/src/peer/Node.java b/ws2012/P2P/uebungen/4/src/peer/Node.java
index 8773aced..01da75a8 100644
--- a/ws2012/P2P/uebungen/4/src/peer/Node.java
+++ b/ws2012/P2P/uebungen/4/src/peer/Node.java
@@ -31,10 +31,6 @@ public class Node {
 	private UDPListen udpListen;
 
 	public Node() {
-<<<<<<< HEAD
-		// System.setProperty("java.net.preferIPv4Stack" , "true"); // optional
-		// IPv4 (mac, windows)
-=======
 		System.setProperty("java.net.preferIPv4Stack" , "true"); // optional IPv4 (mac, windows)
 		
 		//get a port
@@ -48,7 +44,6 @@ public class Node {
 			}
 		}
 		
->>>>>>> fixed string.split(), fixed indices
 		try {
 			channel = DatagramChannel.open();
 			channel.socket().bind(new InetSocketAddress("localhost", port));