From e9e39853a40130af18c71f9416def6b3f365d1c6 Mon Sep 17 00:00:00 2001
From: andrepereiradasilva <andrepereiradasilva@users.noreply.github.com>
Date: Sun, 8 May 2016 12:20:29 +0100
Subject: [PATCH] fix conflicts 2

---
 administrator/templates/isis/login.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/templates/isis/login.php b/administrator/templates/isis/login.php
index 59638e15de9b8..9422cdb33e1bf 100644
--- a/administrator/templates/isis/login.php
+++ b/administrator/templates/isis/login.php
@@ -132,7 +132,7 @@ function colorIsLight($color)
 			&copy; <?php echo date('Y'); ?> <?php echo $sitename; ?>
 		</p>
 		<a class="login-joomla hasTooltip" href="https://www.joomla.org" target="_blank" title="<?php echo JHtml::tooltipText('TPL_ISIS_ISFREESOFTWARE'); ?>"><span class="icon-joomla"></span></a>
-		<a href="<?php echo $frontEndUri->toString(); ?>" target="_blank" class="pull-left"><span class="icon-out-2"></span> <?php echo JText::_('COM_LOGIN_RETURN_TO_SITE_HOME_PAGE'); ?></a>
+		<a href="<?php echo $frontEndUri->toString(); ?>" target="_blank" class="pull-left"><span class="icon-out-2"></span><?php echo JText::_('COM_LOGIN_RETURN_TO_SITE_HOME_PAGE'); ?></a>
 	</div>
 	<jdoc:include type="modules" name="debug" style="none" />
 </body>