Fix bootstrap template

tpl/bootstrap.php

@@ -465,19 +465,11 @@ endif;
 					<a href="https://www.mozilla.org/firefox/">Firefox</a>,
 					<a href="https://www.opera.com/">Opera</a>,
 					<a href="https://www.google.com/chrome">Chrome</a>…
-<<<<<<< HEAD
 				</div>
 				<div id="pastesuccess" role="alert" class="hidden alert alert-success">
 					<span class="glyphicon glyphicon-ok" aria-hidden="true"></span>
 					<div id="deletelink"></div>
 					<div id="pastelink"></div>
-=======
-			</div>
-				<div id="pasteSuccess" role="alert" class="hidden alert alert-success">
-				<span class="glyphicon glyphicon-ok" aria-hidden="true"></span>
-				<div id="deletelink"></div>
-				<div id="pastelink">
->>>>>>> 08972e4da33c72a2fad7d04ce065147f5fa5f0c1
 <?php
 if (strlen($URLSHORTENER)):
 ?>
@@ -488,7 +480,6 @@ if (strlen($URLSHORTENER)):
 endif;
 ?>
 				</div>
-			</div>
 				<ul id="editorTabs" class="nav nav-tabs hidden">
 					<li role="presentation" class="active"><a id="messageedit" href="#"><?php echo I18n::_('Editor'); ?></a></li>
 					<li role="presentation"><a id="messagepreview" href="#"><?php echo I18n::_('Preview'); ?></a></li>