Resolved merge problem

mkleine · Apr 27, 2012 · 8543c21 · 8543c21
1 parent aae1670
commit 8543c21
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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>