diff options
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/openid_client/start.php | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/mod/openid_client/start.php b/mod/openid_client/start.php index 9da701b6b..a21832230 100644 --- a/mod/openid_client/start.php +++ b/mod/openid_client/start.php @@ -30,10 +30,6 @@ function openid_client_init() { 'Anillosur' => 'https://anillosur.net/mod/openid_server/server.php',
'Saravea' => 'https://saravea.net/mod/openid_server/server.php',
'Enekenbat' => 'https://enekenbat.cc/mod/openid_server/server.php',
-<<<<<<< HEAD -======= -
->>>>>>> 84be7867eac3e0b69cca4d84c184f6e8e4d2e43b // ...
));
|