Can you please resolve conflicts, then i can pull and test?

You should be able to just merge master, then rebuild

I think that is ready for testing

Just getting around to this, and looking at the diffs something is messed up, because it is showing my changes as additions in your PR. I could easily add your change, but I would like you to get credit for it.

Can you please try to re-merge master using the instructions here? We should only see your changes as additions.

Hi,
I re-merged master with these instructions. I solved conflicts and pushed my fork. Is it good for you ?

@paidge yes except your formatting is causing whitespace changes. Please match the formatting - spaces not tabs, only 2 spaces/tab

sorry i dont understand. I ran npm run lint and GIT did not reference any difference. How could I resolve this issue ? In VS Code parameters ?

I saw that line 123 was not correctly idented. I corrected manually. Is it better ?

Look at this diff and look at the indents. You are using 4-space tab indents, but the rest of the file is using 2-space indents. You've only changed line 122-125, but lines 108-129 have changes because of the whitespace. Also lines 108 and 129 have no indent, when they should have an indent. You've also added several empty lines.

Once you get it where only lines 122-125 have a change (minus the empty lines), you'll know you've fixed it.

Strange. I replaced manually tabs with spaces. This should be ok now.

Look at the diff again. Still whitespace changes, because the indent for the function is gone - this should be visible as you scroll the code in your IDE. Also the empty lines still there.

Drop another comment after you've pushed, and doubled checked the diff in the "files changed" tab of this PR. It should only have green on the four lines you changed.

sry. I checked the diff and indentation should be right

That'll work, thanks for sticking with it!