add distlayout attributes to maestro-core schema

attributes/maestro-core.yaml

@@ -137,6 +137,7 @@ maestro-attributes:
     documentation: Indicates that the CDO data are distributed among various
                    maestro compoenets. Users are not expected to utilize or
                    set this attribute.
+<<<<<<< HEAD
 
 #FIXME only support now irregular_1D dist layout
   - key: "cdo.dist-layout"
@@ -146,6 +147,8 @@ maestro-attributes:
     documentation: The CDO data distribution among various
                    maestro compoenets.
 
+=======
+>>>>>>> 5b1f05e (add distlayout attributes to maestro-core schema)
 
   ## Lifetime related
   # - key: "cdo.lifetime"