fix conflict

[tools/medcoupling.git] / src / ParaMEDMEM / DisjointDEC.hxx

diff --git a/src/ParaMEDMEM/DisjointDEC.hxx b/src/ParaMEDMEM/DisjointDEC.hxx
index aec6bb901c1b14faca452d897253437257689555..a4073a2920377ef28168bd3dd8bbddba143b802f 100644 (file)
--- a/src/ParaMEDMEM/DisjointDEC.hxx
+++ b/src/ParaMEDMEM/DisjointDEC.hxx
@@ -41,8 +41,9 @@ namespace ParaMEDMEM
   {
   public:
     DisjointDEC():_local_field(0),_union_group(0),_source_group(0),_target_group(0),
-      _owns_field(false),_owns_groups(false),
-      _comm_interface(0), _union_comm(MPI_COMM_NULL)
+    _comm_interface(0),
+    _owns_field(false),_owns_groups(false),
+    _union_comm(MPI_COMM_NULL)
     { }
     DisjointDEC(ProcessorGroup& source_group, ProcessorGroup& target_group);
     DisjointDEC(const DisjointDEC&);