Skip to content

Commit

Permalink
Fix conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@cetincakiroglu
cetincakiroglu committed Dec 6, 2023
1 parent 7dda91d commit 4a4eae7
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions src/app/showcase/pages/lts/lts.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,7 @@
<hr class="my-3 mx-0 border-top-1 border-none surface-border" />
<div class="flex gap-3 flex-wrap">
<div class="flex gap-3 flex-wrap">
<<<<<<< HEAD <span class="text-2xl font-medium text-600 line-through">$249</span>
<span class="text-2xl font-bold text-900">$149</span>
=======
<span class="text-2xl font-bold text-900">$249</span>
>>>>>>> prod
<span class="text-2xl font-bold text-900">$249</span>
</div>
</div>
<hr class="my-3 mx-0 border-top-1 border-none surface-border" />
Expand Down

1 comment on commit 4a4eae7

@vercel
Copy link

@vercel vercel bot commented on 4a4eae7 Dec 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Deployment failed with the following error:

The value for maxDuration must be between 1 second and 10 seconds, in order to increase this limit upgrade your plan: https://vercel.com/pricing

Please sign in to comment.