fix conflict

[modules/med.git] / medtool / src / MEDCoupling / MEDCouplingRefCountObject.hxx

diff --git a/medtool/src/MEDCoupling/MEDCouplingRefCountObject.hxx b/medtool/src/MEDCoupling/MEDCouplingRefCountObject.hxx
index 4eea72a52a81f1886c5781481a0fc38b964b86f3..897cdc6f749c3eb681cf174580825b2669c9d6ba 100644 (file)
--- a/medtool/src/MEDCoupling/MEDCouplingRefCountObject.hxx
+++ b/medtool/src/MEDCoupling/MEDCouplingRefCountObject.hxx
@@ -36,6 +36,7 @@ namespace ParaMEDMEM
     CPP_DEALLOC = 3
   } DeallocType;
 
+  //! The various spatial discretization of a field
   typedef enum
   {
     ON_CELLS = 0,
@@ -45,6 +46,7 @@ namespace ParaMEDMEM
     ON_NODES_KR = 4
   } TypeOfField;
 
+  //! The various temporal discretization of a field
   typedef enum
   {
     NO_TIME = 4,