kblincoe / QualOpt_SE701

2 stars 15 forks source link

Improved participant selection when creating a study #38 #122

Closed xavier630 closed 6 years ago

xavier630 commented 6 years ago

This pull request closes #38, to improve the process of selecting participants when creating a study. This can be found here: https://github.com/kblincoe/QualOpt_SE701/issues/38

To improve the process of selecting participants, I addressed the issue in several ways:

xavier630 commented 6 years ago

@softeng-701 - Could you please review/merge the changes?

softeng-701 commented 6 years ago

@xavier630 Please squash your commits, thanks!

softeng-701 commented 6 years ago

@xavier630 resolve conflicts, please! Also squash your commits.

xavier630 commented 6 years ago

Working on it now. :)

xavier630 commented 6 years ago

@softeng-701 Hi, the branch is all squashed and there are no conflicts with master. Thanks for all of your hard work managing this repo.

Cheers, Xavier

softeng-701 commented 6 years ago

@xavier630 Will do it, once the previous PRs are merged!

xavier630 commented 6 years ago

@softeng-701 Thanks!

softeng-701 commented 6 years ago

@xavier630 why do we have conflict again? can you please check, thanks!

xavier630 commented 6 years ago

@softeng-701 Yep, I'll resolve it now.

xavier630 commented 6 years ago

@softeng-701 All resolved.