From 1667d831addd6e6e9f7278b573b01d6d06d6e1cc Mon Sep 17 00:00:00 2001 From: John Date: Thu, 8 Jun 2023 18:34:48 +0000 Subject: [PATCH] fixed compile error because Source Safe doesn't know how to merge properly NOR does is give you the option to just use the file you're checking in, instead of trying it merge just the changed lines. --- .../DisplaySearch.Designer.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs b/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs index c3ea9b6c..19776863 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs @@ -319,16 +319,16 @@ namespace Volian.Controls.Library // // pnlTranVersion // - this.pnlTranVersion.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;? - this.pnlTranVersion.Controls.Add(this.cbxTranVersion);? - this.pnlTranVersion.Controls.Add(this.lblTranVersion);? - this.pnlTranVersion.Dock = System.Windows.Forms.DockStyle.Top;? - this.pnlTranVersion.Location = new System.Drawing.Point(1, 1);? + this.pnlTranVersion.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.pnlTranVersion.Controls.Add(this.cbxTranVersion); + this.pnlTranVersion.Controls.Add(this.lblTranVersion); + this.pnlTranVersion.Dock = System.Windows.Forms.DockStyle.Top; + this.pnlTranVersion.Location = new System.Drawing.Point(1, 1); this.pnlTranVersion.Margin = new System.Windows.Forms.Padding(2); - this.pnlTranVersion.Name = "pnlTranVersion";? - this.pnlTranVersion.Padding = new System.Windows.Forms.Padding(1);? + this.pnlTranVersion.Name = "pnlTranVersion"; + this.pnlTranVersion.Padding = new System.Windows.Forms.Padding(1); this.pnlTranVersion.Size = new System.Drawing.Size(275, 21); - this.pnlTranVersion.TabIndex = 0;? + this.pnlTranVersion.TabIndex = 0; // // cbxTranVersion //