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

Swhs datadefs #1253

Closed
wants to merge 6 commits into from
Closed

Swhs datadefs #1253

wants to merge 6 commits into from

Conversation

danscime
Copy link
Collaborator

@danscime danscime commented May 2, 2019

Added tau_P^S and tau_P^L to SWHS data definitions.
This should close #1070

@JacquesCarette
Copy link
Owner

And because of other merges, this is now conflicting - can you fix this please?

@danscime
Copy link
Collaborator Author

danscime commented May 3, 2019

Fixed conflict.

@danscime
Copy link
Collaborator Author

danscime commented May 3, 2019

Did not mean to add code/SRS and code/Website, they have been removed with either this pull request, or in #1257.

@JacquesCarette
Copy link
Owner

And another merge is required...

@danscime
Copy link
Collaborator Author

danscime commented May 4, 2019

Resolved Merge.

@JacquesCarette
Copy link
Owner

But now Travis fails... note that this PR now only contains changes to stable and nothing else, which is weird.

@danscime
Copy link
Collaborator Author

danscime commented May 6, 2019

What should be done?

@danscime
Copy link
Collaborator Author

danscime commented May 6, 2019

These changes have actually been added in #1257.
My Latex Tab branch was created as if the SWHS changes had been made, I may have branched from my branch.
In which case, this PR should not go through?

@JacquesCarette
Copy link
Owner

You should click on 'Details' on the page on github for this PR to see how/why the build failed. If you can't figure out the problem, maybe get some help from @Mornix or @bmaclach ?

@danscime
Copy link
Collaborator Author

danscime commented May 6, 2019

The checks failed due to a mismatch between generated and stable.
Regardless, the changes from this PR were already added in #1257.
I think we can just close this PR, no merge needed.

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.

SWHS: Difference b/w Stable and Manual: Add definitions for tau_P^S and tau_P^L
3 participants