aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2014-01-22 17:40:36 +0100
committerSem <sembrestels@riseup.net>2014-01-22 17:40:36 +0100
commitc2707bb867ddb285af85d7a0e75db26ef692d68c (patch)
treec5a280b8fec06f8889a5e8875c2341fd1df74207
parent68614b769f4ae4f28c3f395f47b68baba7c48c64 (diff)
parentb03051a0fa0a633e63682a39524d1ddaaeae599b (diff)
downloadelgg-master.tar.gz
elgg-master.tar.bz2
Merge branch 'hotfix/1.8.1.1'HEADmaster
-rw-r--r--mod/openid_client/start.php4
1 files changed, 0 insertions, 4 deletions
diff --git a/mod/openid_client/start.php b/mod/openid_client/start.php
index 9da701b..a218322 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
// ...
));