Fix conflicts

Milos · Milos · commit 47d4fcd1d73b · 2018-10-15T10:35:04.000+02:00
diff --git a/src/JsonApiDotNetCore/Data/DefaultEntityRepository.cs b/src/JsonApiDotNetCore/Data/DefaultEntityRepository.cs
@@ -316,7 +316,7 @@ public virtual IQueryable<TEntity> Include(IQueryable<TEntity> entities, string
                     ? relationship.RelationshipPath
                     : $"{internalRelationshipPath}.{relationship.RelationshipPath}";
 
-                if (i < relationshipChain.Length)
+                if(i < relationshipChain.Length)
                     entity = _jsonApiContext.ContextGraph.GetContextEntity(relationship.Type);
             }
 
diff --git a/src/JsonApiDotNetCore/Internal/Query/RelatedAttrFilterQuery.cs b/src/JsonApiDotNetCore/Internal/Query/RelatedAttrFilterQuery.cs
@@ -29,5 +29,6 @@ public RelatedAttrFilterQuery(
 
         [Obsolete("Use " + nameof(Relationship) + " instead.")]
         public RelationshipAttribute FilteredRelationship { get; set; }
+
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,7 @@ public virtual IQueryable<TEntity> Include(IQueryable<TEntity> entities, string`
`316`	`316`	`? relationship.RelationshipPath`
`317`	`317`	`: $"{internalRelationshipPath}.{relationship.RelationshipPath}";`
`318`	`318`
`319`		`- if (i < relationshipChain.Length)`
	`319`	`+ if(i < relationshipChain.Length)`
`320`	`320`	`entity = _jsonApiContext.ContextGraph.GetContextEntity(relationship.Type);`
`321`	`321`	`}`
`322`	`322`
Original file line number	Diff line number	Diff line change
`@@ -29,5 +29,6 @@ public RelatedAttrFilterQuery(`
`29`	`29`
`30`	`30`	`[Obsolete("Use " + nameof(Relationship) + " instead.")]`
`31`	`31`	`public RelationshipAttribute FilteredRelationship { get; set; }`
	`32`	`+`
`32`	`33`	`}`
`33`	`34`	`}`