Merge errors fixed

2015-10-19 22:35:28 +02:00
parent 1e1cc54371
commit 90c4072bb1
1 changed files with 0 additions and 2 deletions
@@ -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
            //