From 03e81b06d515e349ce9609f505a23b4db7fe9405 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 17 Aug 2015 07:24:48 +0200
Subject: [PATCH] we dont need the or anymore

---
 mod/settings.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mod/settings.php b/mod/settings.php
index 4c37247c63..3b9f0211e2 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -1109,7 +1109,6 @@ function settings_content(&$a) {
 
 	$prof_addr = replace_macros($tpl_addr,array(
 		'$desc' => sprintf(t("Your Identity Address is <strong>'%s'</strong> or '%s'."), $nickname.'@'.$a->get_hostname(), $a->get_baseurl().'/profile/'.$nickname),
-		'$or' => t('or'),
 		'$basepath' => $a->get_hostname()
 	));
 
-- 
2.39.5