fix: merge conflicts resolved

This commit is contained in:
sriram veeraghanta
2024-05-22 18:30:22 +05:30
180 changed files with 8642 additions and 621 deletions

View File

@@ -19,8 +19,11 @@
"NEXT_PUBLIC_EXTRA_IMAGE_DOMAINS",
"NEXT_PUBLIC_POSTHOG_KEY",
"NEXT_PUBLIC_POSTHOG_HOST",
"NEXT_PUBLIC_GOD_MODE",
"NEXT_PUBLIC_POSTHOG_DEBUG",
"NEXT_PUBLIC_SUPPORT_EMAIL",
"NEXT_PUBLIC_PRO_PLAN_MONTHLY_REDIRECT_URL",
"NEXT_PUBLIC_PRO_PLAN_YEARLY_REDIRECT_URL",
"SENTRY_AUTH_TOKEN"
],
"pipeline": {