Unmegred changes was breaking elgg.

diff --git a/mod/openid_client/start.php b/mod/openid_client/start.php
index 9da701b6bad10f3853b2c84d79e3ad61e46f8226..a21832230ab8c30e731e097593630577f1c2e5be 100644 (file)
--- 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',\r
                 'Saravea'               => 'https://saravea.net/mod/openid_server/server.php',\r
                 'Enekenbat'             => 'https://enekenbat.cc/mod/openid_server/server.php',\r
-<<<<<<< HEAD
-=======
-\r
->>>>>>> 84be7867eac3e0b69cca4d84c184f6e8e4d2e43b
                // ...\r
        ));\r
 \r