Fix merge conflicts

This commit is contained in:
Tuan Dang
2023-07-21 14:37:13 +07:00
136 changed files with 5831 additions and 16909 deletions
@@ -7,8 +7,8 @@ import {
export const BillingSettingsPage = () => {
const { t } = useTranslation();
return (
<div className="flex justify-center bg-bunker-800 text-white w-full h-full px-6">
<div className="max-w-7xl w-full">
<div className="flex justify-center bg-bunker-800 text-white w-full h-full">
<div className="max-w-7xl px-6 w-full">
<div className="my-6">
<p className="text-3xl font-semibold text-gray-200">{t("billing.title")}</p>
<div />