Skip to content

Commit

Permalink
resolve merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@MarenHanke
MarenHanke committed Mar 11, 2024
2 parents 967e0f1 + 897871e commit 0cafea5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion etc/i5.las2peer.connectors.webConnector.WebConnector.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ crossOriginResourceMaxAge = 600
maxRequestBodySize = 300000000
enableCrossOriginResourceSharing = TRUE
onlyLocalServices = TRUE
oidcProviders = https://auth.las2peer.org/auth/realms/main,https://accounts.google.com
oidcProviders = https://auth.las2peer.org/auth/realms/main,https://accounts.google.com

0 comments on commit 0cafea5

Please sign in to comment.