From 90c4072bb1a59511912d44cb5c0777337eba66f2 Mon Sep 17 00:00:00 2001
From: Kenneth van Ewijk <kennyboy@live.nl>
Date: Mon, 19 Oct 2015 22:35:28 +0200
Subject: [PATCH] Merge errors fixed

---
 ErgometerDoctorApplication/ConActiveSessions.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ErgometerDoctorApplication/ConActiveSessions.cs b/ErgometerDoctorApplication/ConActiveSessions.cs
index 0bd73e3..3dbb56e 100644
--- a/ErgometerDoctorApplication/ConActiveSessions.cs
+++ b/ErgometerDoctorApplication/ConActiveSessions.cs
@@ -10,7 +10,6 @@ namespace ErgometerDoctorApplication
 {
     public class ConActiveSessions : Panel
     {
-<<<<<<< HEAD
 
         private FlowLayoutPanel flowlayout;
 
@@ -59,7 +58,6 @@ namespace ErgometerDoctorApplication
             this.Name = "ConActiveSessions";
             this.Size = new System.Drawing.Size(584, 459);
             this.TabIndex = 0;
-<<<<<<< HEAD
             // 
             // labelActiveSessions
             //