Skip to content

Commit

Permalink
Fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
ajcvickers committed Aug 28, 2020
1 parent d769ba0 commit 2c1757c
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion src/EFCore/Metadata/Internal/CoreAnnotationNames.cs
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,6 @@ public static class CoreAnnotationNames
AmbiguousNavigations,
DuplicateServiceProperties,
AmbiguousField,
SkipDetectChangesAnnotation,
FullChangeTrackingNotificationsRequiredAnnotation
};
}
Expand Down

0 comments on commit 2c1757c

Please sign in to comment.