Skip to content

Conversation

@QuantumOperator
Copy link

Fixed my adding function in my file and made Sam's file more Alabamian

@marcosfrenkel
Copy link
Owner

@QuantumOperator This in fact has conflicts that you would need to fix to get it approved and merged

Copy link
Owner

@marcosfrenkel marcosfrenkel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix merge conflict

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