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

Add Obsidian Tears to Showcase #1738

Merged
merged 5 commits into from
Jul 31, 2023
Merged

Conversation

tiagoicp
Copy link
Contributor

@tiagoicp tiagoicp commented Jul 27, 2023

@tiagoicp tiagoicp requested a review from a team as a code owner July 27, 2023 15:42
@dfinity-droid-prod
Copy link

Dear @tiagoicp,

In order to potentially merge your code in this open-source repository and therefore proceed with your contribution, we need to have your approval on DFINITY's CLA1.

If you decide to agree with it, please visit this issue and read the instructions there.

— The DFINITY Foundation

Footnotes

  1. Contributor License Agreement

@dfinity-droid-prod
Copy link

Dear @tiagoicp,

In order to potentially merge your code in this open-source repository and therefore proceed with your contribution, we need to have your approval on DFINITY's CLA1.

If you decide to agree with it, please visit this issue and read the instructions there.

— The DFINITY Foundation

Footnotes

  1. Contributor License Agreement

@tiagoicp
Copy link
Contributor Author

@sesi200 cla is still pending, despite having been approved as you can see from a label above. Seen that this issue happened in the past. Could you also help out in here? Apologies for bothering.

@jessiemongeon1
Copy link
Contributor

Hi @tiagoicp , the CLA has been set as 'agreed', but there is a file conflict. Please resolve the file conflict. Thanks!

auto-merge was automatically disabled July 29, 2023 05:02

Head branch was pushed to by a user without write access

@tiagoicp
Copy link
Contributor Author

Done @jessiemongeon1 , kindly review and merge 🙏

@jessiemongeon1 jessiemongeon1 merged commit f6a796e into dfinity:master Jul 31, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants