fix: merge and resolve git conflicts

novuhq · Oct 31, 2023 · 765d7f4 · 765d7f4
2 parents 28fec67 + 93b09c9
commit 765d7f4
Show file tree

Hide file tree

Showing 24 changed files with 451 additions and 0 deletions.
diff --git a/apps/web/public/static/images/providers/dark/azure-sms.png b/apps/web/public/static/images/providers/dark/azure-sms.png
diff --git a/apps/web/public/static/images/providers/dark/square/azure-sms.svg b/apps/web/public/static/images/providers/dark/square/azure-sms.svg
diff --git a/apps/web/public/static/images/providers/light/azure-sms.png b/apps/web/public/static/images/providers/light/azure-sms.png