resolved conflicts

This commit is contained in:
2025-03-31 03:46:05 +03:00
6454 changed files with 1520539 additions and 9 deletions
@@ -0,0 +1,11 @@
<?php use Streamline\Enums\Roles; ?>
<?php if(Auth::user()->hasRole('Admin')): ?>
<?php if(warning_duration()): ?>
<div class="<?php echo e(show_subscription_reminder_message('class')); ?> " style="margin-left: -25.5px; margin-bottom:0%; margin-right: -25.5px;">
<i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
<span style="font-weight:600;line-height: 22px;"><?php echo e(show_subscription_reminder_message()); ?></span>
</div>
<?php endif; ?>
<?php endif; ?><?php /**PATH /var/www/html/resources/views/general_settings/subscription_noti.blade.php ENDPATH**/ ?>