Source Safe’s merge kept two declarations for DisplaySearch1 during check-in. One was removed to resolve compiler error.
This commit is contained in:
parent
f0302b589d
commit
6ab7801387
@ -46,13 +46,6 @@ namespace VEPROMS
|
||||
set { _DisplaySearch1 = value; }
|
||||
}
|
||||
|
||||
private DisplaySearch _DisplaySearch1 = null;
|
||||
|
||||
public DisplaySearch DisplaySearch1
|
||||
{
|
||||
get { return _DisplaySearch1; }
|
||||
set { _DisplaySearch1 = value; }
|
||||
}
|
||||
|
||||
// For the initial release, we are assuming there will be only one rofst for a docversion. Changes
|
||||
// will be needed here if more than 1.
|
||||
|
Loading…
x
Reference in New Issue
Block a user