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

Upstream Sync #32

Closed
wants to merge 0 commits into from
Closed

Upstream Sync #32

wants to merge 0 commits into from

Conversation

DEATHB4DEFEAT
Copy link
Member

Description

Description.

Tasks

  • Task
  • Completed Task

Media

Changelog

🆑

  • add: Added fun!
  • tweak: Tweaked fun!
  • fix: Fixed fun!
  • remove: Removed fun!

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jan 16, 2024
@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions GitHub Actions
Copy link
Contributor

RSI Diff Bot; head commit 942eecf merging into 3a57bb9
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an rsi Changes: UI Changes any XAML files labels Jan 16, 2024
@github-actions github-actions bot removed Changes: Sprite Changes any png or json in an rsi Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Map Changes any yml file in the Maps directories Changes: UI Changes any XAML files Changes: Documentation Changes any xml or md files labels Jan 16, 2024
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
Status: Merge Conflict FIX YOUR PR AAAGH
Projects
None yet
Milestone
No milestone
Development

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