Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Merge Conflict #2746

Open
wants to merge 26 commits into
base: dev
Choose a base branch
from
Open

Fix Merge Conflict #2746

wants to merge 26 commits into from

Conversation

MeyerPV
Copy link
Collaborator

@MeyerPV MeyerPV commented Oct 14, 2024

No description provided.

MeyerPV and others added 25 commits April 3, 2024 11:09
# Conflicts:
#	src/pages/PrivacyPolicy/PrivacyPolicy.tsx
#	src/pages/PrivacyPolicy/index.ts
Merge Staging to Production
Remove traces
Added conditional function call
Copy link

netlify bot commented Oct 14, 2024

Deploy Preview for preview-common ready!

Name Link
🔨 Latest commit 6ed41ac
🔍 Latest deploy log https://app.netlify.com/sites/preview-common/deploys/670d5ba4476a330008bdc5fa
😎 Deploy Preview https://deploy-preview-2746--preview-common.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants