Cleanup CVS ipmorted branch

[karo-tx-redboot.git] / tools / src / tools / configtool / standalone / wxwin / conflictsdlg.h

diff --git a/tools/src/tools/configtool/standalone/wxwin/conflictsdlg.h b/tools/src/tools/configtool/standalone/wxwin/conflictsdlg.h
index 66dfb398a81fbcfb3636246577fdf9ce8741f134..e8fad7003b8698971345414b93ffa2e7478d01f3 100644 (file)
--- a/tools/src/tools/configtool/standalone/wxwin/conflictsdlg.h
+++ b/tools/src/tools/configtool/standalone/wxwin/conflictsdlg.h
@@ -30,7 +30,7 @@
 // Author(s):   julians
 // Contact(s):  julians
 // Date:        2000/09/06
-// Version:     $Id$
+// Version:     $Id: conflictsdlg.h,v 1.2 2001/03/23 13:38:04 julians Exp $
 // Purpose:
 // Description: Header file for ecResolveConflictsDialog
 // Requires: