From 8543c211fff007c303f0ceaae051c155de433712 Mon Sep 17 00:00:00 2001
From: Frauke Pantekoek <frauke.pantekoek@coremedia.com>
Date: Fri, 27 Apr 2012 16:41:37 +0200
Subject: [PATCH] Resolved merge problem

---
 server/js-nodejs/src/main/js/client/index.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/server/js-nodejs/src/main/js/client/index.html b/server/js-nodejs/src/main/js/client/index.html
index 7e768c6..b00c5c9 100644
--- a/server/js-nodejs/src/main/js/client/index.html
+++ b/server/js-nodejs/src/main/js/client/index.html
@@ -54,18 +54,14 @@
   <p>
     <button id="currentMatchButton">Get current match</button>
   </p>
-<<<<<<< HEAD
 
   <p>
     <button id="lastFinishedMatch">Get last finished match</button>
   </p>
 
-=======
-  
   <p>
     <button id="numberOfPlayedMatchesButton">Number of played matches</button>
   </p>
->>>>>>> Display # played matches
 </div>
 <p>Messages</p>