git merge cruft included in functional-tests.ifr.j2
yazug opened this issue · comments
https://github.com/bregman-arie/infraform/blob/master/infraform/scenarios/podman/functional-tests.ifr.j2 currently has merge cruft
which looks to have came from here 5362c0a#r62907725