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

usatxre -> active #3426

Merged
merged 3 commits into from
Dec 19, 2019
Merged

usatxre -> active #3426

merged 3 commits into from
Dec 19, 2019

Conversation

yakra
Copy link
Contributor

@yakra yakra commented Dec 19, 2019

No description provided.

@jteresco jteresco merged commit 92b9304 into TravelMapping:master Dec 19, 2019
@jteresco
Copy link
Contributor

Since two activations are happening on the same day, I had to resolve a conflict by keeping both new entries. Simple enough, but there's now an extra commit into the LoneStar branch, I think.

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