No merge conflict branch#3

Open

oleksandr-maksymikhin wants to merge 2 commits intoProgramEngineeringKPI:no-merge-conflict-branchfrom

oleksandr-maksymikhin:no-merge-conflict-branch

Commits on Feb 8, 2020

Add waiting for user input after program has run
gisachenko
committed

Commits on May 27, 2020

Merge branch 'merge-conflict-auto-resolve' into no-merge-conflict-branch
oleksandr-maksymikhin
committed