| commit | 45d5e3fc62643b37278315422102e8cf857313e1 | [log] [tgz] |
|---|---|---|
| author | Antonin Stefanutti <antonin@stefanutti.fr> | Wed Oct 09 17:50:15 2019 +0200 |
| committer | Antonin Stefanutti <astefanutti@users.noreply.github.com> | Thu Oct 10 08:53:49 2019 +0200 |
| tree | 445fe82a36ea4d3b0637b3b4dbf84f410e406f6a | |
| parent | 552425e649996d9c3a9ca4638cf9a5fd0a4d266c [diff] |
fix: Handle traits update conflicts gracefully