Skip to content

fix merge conflict#15

Merged
jxx-gg merged 1 commit intomasterfrom
fix-merge
Feb 10, 2021
Merged

fix merge conflict#15
jxx-gg merged 1 commit intomasterfrom
fix-merge

Conversation

@jxx-gg
Copy link
Copy Markdown
Contributor

@jxx-gg jxx-gg commented Feb 10, 2021

cleaning up a few merge conflict text

@jxx-gg jxx-gg merged commit 8342cf1 into master Feb 10, 2021
@jxx-gg jxx-gg deleted the fix-merge branch February 18, 2021 19:32
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