Skip to content

resolved merge conflict #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Jul 4, 2022
Merged

resolved merge conflict #18

merged 1 commit into from
Jul 4, 2022

Conversation

@HolQue
Copy link
Collaborator

@HolQue HolQue commented Jul 1, 2022

No description provided.

@test-fullautomation
Copy link
Owner

test-fullautomation commented Jul 4, 2022

Hi Holger,
this replaces #17, correct? Then I would decline #17.
Thank you,
Thomas

@HolQue
Copy link
Collaborator Author

HolQue commented Jul 4, 2022

Yes, it's a replacement.

@test-fullautomation test-fullautomation mentioned this pull request Jul 4, 2022
Closed
@test-fullautomation test-fullautomation added enhancement New feature or request 0.5.2 labels Jul 4, 2022
@test-fullautomation test-fullautomation added this to the 0.5.2.0 Win10 milestone Jul 4, 2022
test-fullautomation
test-fullautomation approved these changes Jul 4, 2022
View reviewed changes
Copy link
Owner

@test-fullautomation test-fullautomation left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi Holger,
thank you for your pull request.
I did not review all 34 files. I will go in details, if we observe problems.

Thank you,
Thomas

@test-fullautomation test-fullautomation merged commit f503b00 into develop Jul 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@test-fullautomation test-fullautomation test-fullautomation approved these changes

Assignees

No one assigned

Labels

0.5.2 enhancement New feature or request

Projects

RobotFramework AIO
Archived in project

Milestone

0.5.2.0 Win10

Development

Successfully merging this pull request may close these issues.

3 participants

@HolQue @test-fullautomation