diff options
| author | Sem <sembrestels@riseup.net> | 2014-01-22 17:40:36 +0100 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2014-01-22 17:40:36 +0100 |
| commit | c2707bb867ddb285af85d7a0e75db26ef692d68c (patch) | |
| tree | c5a280b8fec06f8889a5e8875c2341fd1df74207 /mod | |
| parent | 68614b769f4ae4f28c3f395f47b68baba7c48c64 (diff) | |
| parent | b03051a0fa0a633e63682a39524d1ddaaeae599b (diff) | |
| download | elgg-master.tar.gz elgg-master.tar.bz2 | |
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 // ...
));
|