fix: merge

Author: maurei

src/JsonApiDotNetCore/Data/DefaultEntityRepository.cs

@@ -208,24 +208,13 @@ private void LoadInverseRelationships(object trackedRelationshipValue, Relations
         private bool IsHasOneRelationship(string internalRelationshipName, Type type)
         {
             var relationshipAttr = _jsonApiContext.ResourceGraph.GetContextEntity(type).Relationships.SingleOrDefault(r => r.InternalRelationshipName == internalRelationshipName);
-<<<<<<< HEAD
             if(relationshipAttr != null)
             {
                 if (relationshipAttr is HasOneAttribute) return true;
                 return false;
             } else
             {
                 // relationshipAttr is null when we don't put a [RelationshipAttribute] on the inverse navigation property.
-=======
-            if (relationshipAttr != null)
-            {
-                if (relationshipAttr is HasOneAttribute) return true;
-                return false;
-            }
-            else
-            {
-                // relationshipAttr is null when there is not put a [RelationshipAttribute] on the inverse navigation property.
->>>>>>> master
                 // In this case we use relfection to figure out what kind of relationship is pointing back.
                 return !(type.GetProperty(internalRelationshipName).PropertyType.Inherits(typeof(IEnumerable)));
             }