Fixes merge conflict
This commit is contained in:
commit
d20a000303
|
@ -94,16 +94,15 @@
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
<?php if ($previous !== '' && $next !== '') : ?>
|
||||||
<?php if($previous_link_url !== false || $next_link_url !== false): ?>
|
|
||||||
<div class="tainacan-single-post">
|
<div class="tainacan-single-post">
|
||||||
<h2 class="title-content-items"><?php echo __('Also in this collection', 'tainacan-interface') ?></h2>
|
<h2 class="title-content-items"><?php echo __('Also in this collection', 'tainacan-interface') ?></h2>
|
||||||
<div id="item-single-navigation" class="d-flex justify-content-between margin-two-column">
|
<div id="item-single-navigation" class="d-flex justify-content-between margin-two-column">
|
||||||
<div class="pagination">
|
<div class="pagination">
|
||||||
<?php if($previous_link_url !== false) previous_post_link($previous); ?>
|
<?php echo $previous; ?>
|
||||||
</div>
|
</div>
|
||||||
<div class="pagination">
|
<div class="pagination">
|
||||||
<?php if($next_link_url !== false) next_post_link($next); ?>
|
<?php echo $next; ?>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue