Skip to content

Conversation

@Felix14-v2
Copy link
Contributor

Better late than never :)

@thedocruby
Copy link
Member

thedocruby commented Jan 8, 2022

Can you please merge the most recent changes into your patch branch? I'd do it myself but I'm not sure which changes to keep and which ones to discard. Thanks!

Edit: just saw your comment on the last PR, please read my response.

@Felix14-v2 Felix14-v2 mentioned this pull request Jan 10, 2022
@thedocruby
Copy link
Member

@Felix14-v2 I still need you to resolve the conflicts by merging the main repo into your fork.

@Felix14-v2

This comment has been minimized.

@thedocruby thedocruby merged commit 9e9fc74 into IrisShaders:main Jan 20, 2022
@thedocruby
Copy link
Member

Thanks!

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.

2 participants