diff options
| author | Nick White <git@njw.name> | 2021-12-06 15:11:10 +0000 |
|---|---|---|
| committer | Nick White <git@njw.name> | 2021-12-06 15:11:10 +0000 |
| commit | 09ab2a36bbb79104208d96951568111821bbcf45 (patch) | |
| tree | fd69c4faff96d52dab070bc7e51257b84bba3688 /roles/devami | |
| parent | 5632c4313f2990d6e24e05915737eb19062c3354 (diff) | |
update pipeliner so that git pulls are merge-resolved with -Xtheirs rather than conflicts causing the service to not start
Diffstat (limited to 'roles/devami')
0 files changed, 0 insertions, 0 deletions