diff options
| author | Elvin Efendi <elvin.efendiev@shopify.com> | 2015-12-08 18:34:16 -0500 |
|---|---|---|
| committer | Elvin Efendi <elvin.efendiev@shopify.com> | 2015-12-08 18:34:16 -0500 |
| commit | 2eef353c6ef98662c3092a5a28ee6f167b1d1774 (patch) | |
| tree | f5a74fd27daeceeafc6141d524fc35ac09846614 /extra | |
| parent | 1df0f01c6166e1ef1653c90818aaa47118af4700 (diff) | |
warn when there is a conflict
Diffstat (limited to 'extra')
0 files changed, 0 insertions, 0 deletions