Uh oh!
There was an error while loading. Please reload this page.
Fixed #360 - #380
Conversation
mivola
commented
Dec 12, 2018
- changing the return value of getters from void to the appropriate object in the model classes
- changing the return value of getters from void to the appropriate object in the model classes
mivola
commented
Apr 2, 2019
@khmarbaise I've seen you had been working on some issues in the past few days - could you maybe also have a look at my pull requests? |
khmarbaise
commented
Apr 2, 2019
I will try...can you check the conflicts... |
mivola
commented
Apr 2, 2019
I'd like to work on the conflicts. The problem is: how to get the changes from your (the upstream) repo to my fork? I tried various ways (https://help.github.com/en/articles/syncing-a-fork, https://github.com/KirstieJane/STEMMRoleModels/wiki/Syncing-your-fork-to-the-original-repository-via-the-browser) but it always ends up with a merge - which is something you do not want IIRC... |
mivola
commented
Apr 3, 2019
I just created a new PR (#403) to avoid cluttering the git repo. Maybe you could merge this before any other changes? |