Description of JSONP format extended (Dynamic parameter names)

test-fullautomation / robotframework-testsuitesmanagement

Apache License 2.0

4 stars 2 forks source link

Description of JSONP format extended (Dynamic parameter names) #277

Closed HolQue closed 6 months ago

test-fullautomation commented 6 months ago

Hi @HolQue , please resolve the merge conflict. Thank you, Thomas

HolQue commented 6 months ago

Hi Thomas,

I am confused and have no idea what is the problem. The merge conflict is caused by the PDF file. To solve the merge conflict I committed a deletion of this file and after this I added the file again. Why is there still a merge conflict?

OK, I will delete the file again. Maybe this solves the merge conflict. After your merge I restore the file.

Long winded.

HolQue commented 6 months ago

Hi Thomas,

please decline this pull request. I will commit again based on latest stabi branch.

test-fullautomation commented 6 months ago

declined as per wish from Holger.