Fixed merge conflict.
This commit is contained in:
parent
be6848a549
commit
746994c2be
|
@ -48,7 +48,7 @@ Contacts_Import={
|
|||
$('#progressbar').progressbar('option', 'value', 100);
|
||||
$('#import_done').find('p').html(t('contacts', 'Result: ') + jsondata.data.imported + t('contacts', ' imported, ') + jsondata.data.failed + t('contacts', ' failed.'));
|
||||
} else {
|
||||
$('#import_done').find('p').html(jsondata.data.message);
|
||||
$('#import_done').find('p').html(jsondata.message);
|
||||
}
|
||||
$('#import_done').show().find('p').addClass('bold');
|
||||
$('#progressbar').fadeOut('slow');
|
||||
|
|
Loading…
Reference in New Issue