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 and update Rolepress products #13

Merged
merged 2 commits into from
Jul 9, 2024
Merged

Add and update Rolepress products #13

merged 2 commits into from
Jul 9, 2024

Conversation

amazingrando
Copy link
Contributor

@amazingrando amazingrando commented Jul 2, 2024

Requires #12 to be merged first.

This PR does the following:

  • Updates the publisher for "Space Cats — The Universe's Cutest Roleplaying Game" from Pluma to Rolepress.
  • Adds new Rolepress products.

How to review this PR

  • Visit the link for "Space Cats — The Universe's Cutest Roleplaying Game" and confirm that the publisher on DriveThruRPG is listed as Rolepress.
  • Confirm the new products listed under Rolepress.

@johnhelmuth
Copy link
Collaborator

I will try to resolve merge conflicts for this PR caused by the merge of PR#15 to main, tonight.

@amazingrando
Copy link
Contributor Author

amazingrando commented Jul 9, 2024 via email

@johnhelmuth
Copy link
Collaborator

Well, due to my l33t git sk1llz, I accepted the wrong side of the merge, and pushed it up to the repo. :blushes:

Had to do a force push to fix the merge commit. If you pulled it down in the few minutes before I discovered and fixed the mistake, you will have to rebuild this branch locally from Github.

Correct merge commit is 90cf32f.

@johnhelmuth johnhelmuth merged commit c012a0d into main Jul 9, 2024
1 check passed
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