From: Sem <sembrestels@riseup.net>
Date: Wed, 22 Jan 2014 16:39:55 +0000 (+0100)
Subject: Unmegred changes was breaking elgg.
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=b03051a0fa0a633e63682a39524d1ddaaeae599b;p=lorea%2Felgg.git

Unmegred changes was breaking elgg.
---

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
 		// ...
 	));