Skip to content
Snippets Groups Projects
Commit 2b1f58f7 authored by Cecile Ntsama's avatar Cecile Ntsama
Browse files

file added to resolve the conflict

parents 2284a2c9 a39c0090
Branches CreateTemplates
No related tags found
1 merge request!4merge dev to main
Showing
with 8 additions and 2 deletions
......@@ -30,3 +30,5 @@ files/**/*
!files/.gitkeep
.idea
.DS_Store
......@@ -39,7 +39,11 @@ HARMONY and EIFFEL. The project is in active development.
For a simple development environment, consult [docker/dev](docker/dev/README.md).
<<<<<<< HEAD
<<<<<<< HEAD
=======
This is a Test
>>>>>>> TeamProjectmanagement
=======
//test
>>>>>>> Teamprojectoverview
......@@ -7,8 +7,8 @@ display_name = "GitHub"
authorize_uri = "https://github.com/login/oauth/authorize"
access_token_uri = "https://github.com/login/oauth/access_token"
userinfo_uri = "https://api.github.com/user"
client_id = "Ov23liwqVDKeBaIHmBfZ"
client_secret = "513b5408f5d19e5bf30cef7201e25d1056923e4f"
client_id = "Ov23liDARHzTNU4Ol0yI"
client_secret = "f339af58456bb9f1874245f98027e45458489a69"
scopes = ["read:user", "user:email"]
[provider.google]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment