Skip to content

Comments

Tournament#12

Open
enzanki-ars wants to merge 148 commits intomasterfrom
tournament
Open

Tournament#12
enzanki-ars wants to merge 148 commits intomasterfrom
tournament

Conversation

@enzanki-ars
Copy link
Member

No description provided.

Copy link
Member Author

Choose a reason for hiding this comment

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

battletemplate is not initialized is seems

@enzanki-ars
Copy link
Member Author

Ready to merge?

@enzanki-ars
Copy link
Member Author

When did that happen. There are no conflicts with base any more?

@jacobsims
Copy link
Member

@enzanki-ars Probably because the commits now rewrite everything in the whole repository.

@enzanki-ars
Copy link
Member Author

And now it can't. Weird.

@enzanki-ars
Copy link
Member Author

Merge #16 First

@enzanki-ars
Copy link
Member Author

Good to go. Previous failure seemed to have been caused by a temporary race condition. Shouldn't happen again, but if it does, we can address it then.

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