From ecaf5aa58b9e52f160bab0b903f2367529067fd7 Mon Sep 17 00:00:00 2001
From: jhuesser <github@jhuesser.ch>
Date: Wed, 13 Jun 2018 10:44:02 +0200
Subject: [PATCH] add some conflicts

---
 template.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/template.php b/template.php
index c4f00b3..f241b44 100644
--- a/template.php
+++ b/template.php
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <?php 
 //This should later be translatable, maybe find a better solution?
 //This is here for better generation of POT files :)
@@ -72,12 +71,12 @@ class Template{
               </ul>
             </div>
             <div class="navbar-collapse collapse navbar-right navbar-admin">
-              <ul class="nav navbar-nav">
+              <ul class="nav navbar-nav mr-auto">
               <?php
               $tg_user = getTelegramUserData();
               if($tg_user !== false){
                 echo'<li><a href="?do=subscriptions">Subscriptions</a></li>';
-                echo '<li><a href="https://status.jhuesser.ch/index.php?subscriber_logout=1">Logout</a></li>';
+                echo '<li><a href="index.php?subscriber_logout=1">Logout</a></li>';
               } else {
                 echo '<li><a href="#"><script async src="https://telegram.org/js/telegram-widget.js?4" data-telegram-login="jhuesserstatusbot" data-size="small" data-userpic="false" data-auth-url="https://status.jhuesser.ch/check.php" data-request-access="write"></script></a></li>';
               }?>