| Index: ui/file_manager/file_manager/foreground/js/ui/conflict_dialog.js
|
| diff --git a/ui/file_manager/file_manager/foreground/js/ui/conflict_dialog.js b/ui/file_manager/file_manager/foreground/js/ui/conflict_dialog.js
|
| index 8aecd737228b6dc7233d3664fa7799859b6531ae..373dcacd6fff63199b381892e0c14e4c15147fed 100644
|
| --- a/ui/file_manager/file_manager/foreground/js/ui/conflict_dialog.js
|
| +++ b/ui/file_manager/file_manager/foreground/js/ui/conflict_dialog.js
|
| @@ -91,7 +91,7 @@ ConflictDialog.prototype = {
|
| *
|
| * @param {string} fileName Filename that is conflicted.
|
| * @param {function(ConflictDialog.Result, boolean)} callback Complete
|
| - * callbak. See also ConflictDialog#callback_.
|
| + * callback. See also ConflictDialog#callback_.
|
| * @return {boolean} True if the dialog can show successfully. False if the
|
| * dialog failed to show due to an existing dialog.
|
| */
|
|
|