Fixed merge conflict by using remote changes
authorcolepoirier <colepoirier@gmail.com>
Wed, 3 Jun 2020 02:24:24 +0000 (19:24 -0700)
committercolepoirier <colepoirier@gmail.com>
Wed, 3 Jun 2020 02:24:24 +0000 (19:24 -0700)
commitb422a15686e9187ec91f13375656e28fcbdc6f8a
tree3b7c70c0da9b2c1ddfe019be51eec36854c21e66
parentf254d5500eda9028cfad1cef910272ba2d22aa78
Fixed merge conflict by using remote changes
src/soc/fu/trap/main_stage.py