update

src/com_tjnotifications/site/views/preferences/tmpl/default_bs5.php

@@ -123,11 +123,7 @@ function removePreferance(pId,client,provider,key)
 	<ul class="nav nav-tabs" id="myTab" role="tablist">
 		<?php if (!empty($this->clients)) : ?>
 		<?php foreach ($this->clients as $i => $menu) :?>
-<<<<<<< HEAD
 		<li class="nav-item" role="tab" role="presentation">
-=======
-		<li class="nav-item" role="presentation">
->>>>>>> upstream/release-3.0.4
 			<button type="button" id="<?php echo($menu->client) . '-tab'; ?>" role="tab" data-bs-target="#<?php echo($menu->client); ?>" data-bs-toggle="tab" class="nav-link <?php echo ($i == 0) ? ' active ' : ''?>">
 				<?php echo str_replace("com_","",$menu->client); ?>
 			</button>