app/views/shared/_import_form.html.haml · b5dbe0bac5dcbdf653937b17bbfcd3e441518638 · nexedi / gitlab-ce

Resolve conflict in app/views/shared/_import_form.html.haml · 2feec65a

Rémy Coutable authored Aug 10, 2017

Based on:

1. 0e85c50252dd43148488eacde57a882bd0b0a4ec
2. d19eaaed2d48e008abf94301a98e8ee806219071
3. 44c7f872219659d107fc01a62c8b5d6778ebbd74
Signed-off-by: Rémy Coutable <remy@rymai.me>

2feec65a

_import_form.html.haml 1.46 KB

Replace _import_form.html.haml