diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2014-03-14 21:25:01 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2014-03-14 21:25:01 -0300 |
| commit | 3651c99a195685f3a868e159e72c4daf8cb371d3 (patch) | |
| tree | cb004dd7b6ca55215a2c20112fe0c5209d98c18e /mod/openid_client/start.php | |
| parent | 97e689213ff4e829f251af526ed4e796a3cc2b71 (diff) | |
| parent | c2707bb867ddb285af85d7a0e75db26ef692d68c (diff) | |
| download | elgg-3651c99a195685f3a868e159e72c4daf8cb371d3.tar.gz elgg-3651c99a195685f3a868e159e72c4daf8cb371d3.tar.bz2 | |
Merge branch 'master' into saravea
Conflicts:
mod/blog/views/default/blog/sidebar/archives.php
Diffstat (limited to 'mod/openid_client/start.php')
| -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 // ...
));
|