Merge problem

e2cc3999 · magnus@neptunus.(none) · 8b9d8b41 · e2cc3999
Commit e2cc3999 authored Jul 27, 2004 by magnus@neptunus.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

ndb/src/common/mgmcommon/ConfigInfo.cpp ndb/src/common/mgmcommon/ConfigInfo.cpp +1 -1

No files found.
--- a/ndb/src/common/mgmcommon/ConfigInfo.cpp
+++ b/ndb/src/common/mgmcommon/ConfigInfo.cpp
@@ -172,7 +172,7 @@ struct DepricationTransform {

 static
 const DepricationTransform f_deprication[] = {
-  ,{ "DB", "Discless", "Diskless", 0, 1 }
+  { "DB", "Discless", "Diskless", 0, 1 },
  { 0, 0, 0, 0, 0}
 };