Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
John Jenko 2023-06-08 18:34:48 +00:00
parent 34679bc07c
commit 1667d831ad
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
PROMS/Volian.Controls.Library/DisplaySearch.Designer.cs generated
View File

@ -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
//