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

Feature/xs3 tests #34

Open
wants to merge 16 commits into
base: develop
Choose a base branch
from
Open

Feature/xs3 tests #34

wants to merge 16 commits into from

Conversation

ed-xmos
Copy link

@ed-xmos ed-xmos commented Dec 16, 2020

No description provided.

@ed-xmos ed-xmos added the DO NOT MERGE Pull requests only label Dec 16, 2020
@ed-xmos ed-xmos removed the DO NOT MERGE Pull requests only label Feb 10, 2021
@mbanth mbanth added type:enhancement New feature or request type:testing Issue with test labels Apr 7, 2021
@danielpieczko
Copy link
Contributor

I recently merged a change to switch this repository to use the public licence, so that is the source of all the merge conflicts here. The LICENSE.txt files have all been deleted (replaced by LICENSE.rst), so you can delete your copies of those files when resolving the conflicts.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type:enhancement New feature or request type:testing Issue with test
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants