Skip to content

Conversation

@PGijsbers
Copy link
Collaborator

Resolves merge conflicts that prevent develop from being merged with master.

mfeurer and others added 4 commits August 19, 2019 15:37
* Fixing broken links (#864)

* Adding license to each source file (#862)

* Preliminary addition of license to source files

* Adding license to almost every source file

* add task_type to list_runs (#857)

* add task_type to list_runs

* length of run change

* changelog

* changes in progress rst

* Prepare new release (#868)
@PGijsbers PGijsbers requested a review from mfeurer October 25, 2020 09:14
@mfeurer mfeurer merged commit 79a6705 into develop Oct 25, 2020
@mfeurer mfeurer deleted the dev-master-merged branch October 25, 2020 16:09
@joaquinvanschoren
Copy link
Contributor

@all-contributors please add @PGijsbers for code

@allcontributors
Copy link
Contributor

@joaquinvanschoren

I've updated the pull request to add @PGijsbers! 🎉

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.

4 participants