Fixed merge conflict.

diff --git a/apps/contacts/js/loader.js b/apps/contacts/js/loader.js
index 8c79ea8a1d676b9ea155d0a9c2c583b926db8379..0e6da10e024c47e905e026ea068acf1d3a07dee2 100644 (file)
--- a/apps/contacts/js/loader.js
+++ b/apps/contacts/js/loader.js
@@ -48,7 +48,7 @@ Contacts_Import={
                                        $('#progressbar').progressbar('option', 'value', 100);\r
                                        $('#import_done').find('p').html(t('contacts', 'Result: ') + jsondata.data.imported + t('contacts', ' imported, ') + jsondata.data.failed + t('contacts', ' failed.'));\r
                                } else {\r
-                                       $('#import_done').find('p').html(jsondata.data.message);\r
+                                       $('#import_done').find('p').html(jsondata.message);\r
                                }\r
                                $('#import_done').show().find('p').addClass('bold');\r
                                $('#progressbar').fadeOut('slow');\r