chore: merged conflicts

This commit is contained in:
Jannat Patel
2025-01-10 11:03:44 +05:30
22 changed files with 383 additions and 93 deletions

View File

@@ -92,10 +92,10 @@
</Tabs>
</div>
<div class="p-5">
<div class="text-xl font-semibold mb-2">
{{ batch.data.title }}
<div class="text-gray-700 font-semibold mb-4">
{{ __('About this batch') }}:
</div>
<div v-html="batch.data.description" class="leading-5 mb-2"></div>
<div v-html="batch.data.description" class="leading-5 mb-4"></div>
<div class="flex items-center avatar-group overlap mb-5">
<div