1 files changed, 3 insertions, 0 deletions
diff --git a/start.php b/start.php
index 03bae6ed5..9da701b6b 100644
--- a/start.php
+++ b/start.php
@@ -30,7 +30,10 @@ 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
 		// ...
 	));