[Quantproject-developers] QuantDownloader/Downloader/Validate ValidateDataTable.cs,1.6,1.7

[<gla...@pr...>]

Update of /cvsroot/quantproject/QuantDownloader/Downloader/Validate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12036/Downloader/Validate

Modified Files:
	ValidateDataTable.cs 
Log Message:
Solved (apparently nonexistent) CVS conflict

Index: ValidateDataTable.cs
===================================================================
RCS file: /cvsroot/quantproject/QuantDownloader/Downloader/Validate/ValidateDataTable.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ValidateDataTable.cs	22 Jan 2004 23:47:02 -0000	1.6
--- ValidateDataTable.cs	25 Jan 2004 15:03:05 -0000	1.7
***************
*** 28,32 ****
--- 28,38 ----
        this.oleDbDataAdapter.Fill( this );
        this.TableName = "quotes";
+ //<<<<<<< ValidateDataTable.cs
+       this.Columns.Add( "ValidationWarning" ,
+         ValidationWarning.OpenHighLowCloseLogicalInconsistency.GetType() );
        
+ //=======
+ //      
+ //>>>>>>> 1.6
      }
  
***************
*** 55,58 ****
--- 61,65 ----
        foreach (DataColumn dataColumn in quotesRow.Table.Columns )
          dataRow[ dataColumn.ColumnName ] = quotesRow[ dataColumn ];
+       dataRow[ "ValidationWarning" ] = eventArgs.ValidationWarning;
        this.Rows.Add( dataRow );
        //this.Rows.Add( quotesRow );