Strange conflict fix

Milos · Milos · commit 5b6e614cf806 · 2018-10-15T11:08:52.000+02:00
diff --git a/src/JsonApiDotNetCore/Internal/Query/RelatedAttrFilterQuery.cs b/src/JsonApiDotNetCore/Internal/Query/RelatedAttrFilterQuery.cs
@@ -26,6 +26,7 @@ public RelatedAttrFilterQuery(
 
         [Obsolete("Use " + nameof(Attribute) + " instead.")]
         public AttrAttribute FilteredAttribute { get; set; }
+
         [Obsolete("Use " + nameof(Relationship) + " instead.")]
         public RelationshipAttribute FilteredRelationship { get; set; }
     }

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ public RelatedAttrFilterQuery(`
`26`	`26`
`27`	`27`	`[Obsolete("Use " + nameof(Attribute) + " instead.")]`
`28`	`28`	`public AttrAttribute FilteredAttribute { get; set; }`
	`29`	`+`
`29`	`30`	`[Obsolete("Use " + nameof(Relationship) + " instead.")]`
`30`	`31`	`public RelationshipAttribute FilteredRelationship { get; set; }`
`31`	`32`	`}`