Cleanup CVS ipmorted branch

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

diff --git a/tools/src/tools/configtool/standalone/wxwin/conflictsdlg.cpp b/tools/src/tools/configtool/standalone/wxwin/conflictsdlg.cpp
index 9ef91fae9a1a82f57bf606c2caa369f95b7c78e8..eb2d11765387ad5b06834a8733e7463efee04100 100644 (file)
--- a/tools/src/tools/configtool/standalone/wxwin/conflictsdlg.cpp
+++ b/tools/src/tools/configtool/standalone/wxwin/conflictsdlg.cpp
@@ -30,7 +30,7 @@
 // Author(s):   julians
 // Contact(s):  julians
 // Date:        2000/09/06
-// Version:     $Id$
+// Version:     $Id: conflictsdlg.cpp,v 1.4 2001/07/09 14:21:32 julians Exp $
 // Purpose:
 // Description: Implementation file for the ecResolveConflictsDialog
 // Requires: