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

(update): A link to o3-setup not found #1151

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from

Conversation

njiddasalifu
Copy link

@njiddasalifu njiddasalifu commented Jul 1, 2024

Former Link was not found

Pull Requests Requirements

  • The PR title includes a brief description of the work done, including the
    Issue number if applicable.
  • The PR title follows conventional commit label standards.
  • The changes confirm to the OpenElis Global x3 Styleguide and design
    documentation.

Summary

Changed the link of O3 setup to the correct link url.

Copy link
Author

@njiddasalifu njiddasalifu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mozzy11 please review this on ur free time.

@mozzy11 mozzy11 changed the base branch from master to develop July 1, 2024 18:26
Copy link

github-actions bot commented Jul 1, 2024

👋 Hi, @njiddasalifu,
Conflicts have been detected against the base branch. Please rebase your branch against the base branch.


This message is automatically generated by prince-chrismc/label-merge-conflicts-action so don't hesitate to report issues/improvements there.

@github-actions github-actions bot added the merge conflict Merge Conflicts label Jul 1, 2024
@mozzy11
Copy link
Collaborator

mozzy11 commented Jul 25, 2024

@njiddasalifu ,
can you resove the merge conflicts

@njiddasalifu
Copy link
Author

@njiddasalifu , can you resove the merge conflicts

@njiddasalifu
Copy link
Author

@njiddasalifu , can you resove the merge conflicts

hello @mozzy11 I have fix the conflicts.

@@ -1,9 +1,9 @@
name: OpenELIS-Global-2 CI Build
on:
push:
branches: [develop]
branches: [master]
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these changes part of the issue ??

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No but those that caused the conflict.

@@ -0,0 +1,62 @@
# This workflow uses actions that are not certified by GitHub.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are this changes part of the issue ??

@github-actions github-actions bot removed the merge conflict Merge Conflicts label Aug 12, 2024
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