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

Rice Paddy P1 #79

Merged
merged 3 commits into from Dec 9, 2023
Merged

Rice Paddy P1 #79

merged 3 commits into from Dec 9, 2023

Conversation

TheShadowOfHassen
Copy link
Owner

No description provided.

@TheShadowOfHassen
Copy link
Owner Author

Oh, there were no sources I directly cited here, so I'm going to hold off putting my name as writing it until the Han overview is merged.

@TheShadowOfHassen
Copy link
Owner Author

OK. I lied.
We have both the rice paddy and the field
And the Han.MD

@indoptogopt
Copy link
Contributor

Looks good. The fields are not in the game though, are they?

@indoptogopt
Copy link
Contributor

indoptogopt commented Dec 8, 2023

Yes, and creating a new Han.md on every branch causes merge conflicts. That also happened to my PRs. But they are easy to resolve, and as soon as the first PR is merged we don't need to create a new one every time.

@TheShadowOfHassen TheShadowOfHassen merged commit f2799ae into main Dec 9, 2023
@TheShadowOfHassen TheShadowOfHassen deleted the rice_paddy branch December 9, 2023 14:13
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.

None yet

2 participants