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.

Sign up for GitHub

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

Jump to bottom

Resolve conflicts #1186

Merged
merged 2 commits into from
Apr 5, 2024
Merged

Resolve conflicts #1186

merged 2 commits into from
Apr 5, 2024

Conversation

ccerv1
Copy link
Member

@ccerv1 ccerv1 commented Apr 5, 2024

No description provided.

@ccerv1 ccerv1 temporarily deployed to external-prs-app April 5, 2024 20:47 — with GitHub Actions Inactive
@vercel Vercel
Copy link

vercel bot commented Apr 5, 2024 •
edited
Loading

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
kariba-network ❌ Failed (Inspect) Apr 5, 2024 8:49pm
oso-docs ✅ Ready (Inspect) Visit Preview 💬 Add feedback Apr 5, 2024 8:49pm
oso-frontend ❌ Failed (Inspect) Apr 5, 2024 8:49pm

@vercel vercel bot temporarily deployed to Preview – oso-frontend April 5, 2024 20:48 Inactive
@vercel vercel bot temporarily deployed to Preview – oso-docs April 5, 2024 20:49 Inactive
@oso-prs
Copy link

oso-prs bot commented Apr 5, 2024

Test deployment for PR #1186 successfully deployed to oso-pull-requests.pr_1186.

@ccerv1 ccerv1 added this pull request to the merge queue Apr 5, 2024
Merged via the queue into main with commit c37c4b7 Apr 5, 2024
4 of 7 checks passed
@ccerv1 ccerv1 deleted the resolve-conflicts branch April 5, 2024 20:51
@ravenac95 ravenac95 mentioned this pull request Apr 9, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@ccerv1