c-harris / ODataMetadata

src/MetadataV3/edmx/TDataServicesType.php

Spacing +2 added lines, -8 removed lines

@@ -153,7 +153,7 @@ 
     {
         if (!$this->isValidArrayOK(
             $dataServices,
-<<<<<<< HEAD
+<< << <<< HEAD
             '\AlgoWeb\ODataMetadata\MetadataV3\edm\Schema',
             $msg,
             1
@@ -176,10 +176,4 @@ 
             return false;
         }
 
-        if (!$this->isValidArrayOK($this->schema, '\AlgoWeb\ODataMetadata\MetadataV3\edm\Schema', $msg, 1)) {
-            return false;
-        }
-
-        return true;
-    }
-}
+        if (!$this->isValidArrayOK($this->schema, '\AlgoWeb\ODataMetadata\MetadataV3\edm\Schema', $msg
\ No newline at end of file

src/MetadataV3/edm/TTypeRefType.php

Spacing +2 added lines, -7 removed lines

@@ -32,7 +32,7 @@ 
      */
     private $type = null;
 
-<<<<<<< HEAD
+<< << <<< HEAD
         /**
          * Gets as type
          *
@@ -75,9 +75,4 @@ 
         if (!$this->isExtensibilityElementOK($msg)) {
             return false;
         }
-        if (!$this->isTFacetAttributesTraitValid($msg)) {
-            return false;
-        }
-        return true;
-    }
-}
+        if (!$this->isTFacetAttributesTraitValid($msg
\ No newline at end of file