Skip to content

Commit 83f0854

Browse files
committed
Resolve conflict.
2 parents 696b209 + b2f878e commit 83f0854

File tree

523 files changed

+233854
-263569
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

523 files changed

+233854
-263569
lines changed

config/ModulesMapping.jsonc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
"Users.Planner": "^users.plannerUser$",
9898
"Users.ProfilePhoto": "^users.profilePhoto$",
9999
"Users.User": "^users.user$|^users.presence$",
100-
"Users.UserSettings": "^users.userSettings$",
100+
"Users.UserSettings": "^users.userSettings$"
101101

102102
// Fails to build.
103103
// "CloudCommunications": "^communications\\.", \\ OData.OpenAPI should handle multiple namespace.

0 commit comments

Comments
 (0)