diff options
| author | Henrik Nord <[email protected]> | 2011-09-20 11:19:21 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2011-09-20 11:19:21 +0200 |
| commit | ec36499d7e329b4dc69a1a3be3422eac7907c260 (patch) | |
| tree | 3fae5bd47f85aa8a3ac40519b2328c4451a00c18 /lib/cosFileTransfer/src | |
| parent | 532c72b3ffeb9219bdb7e6a7f5d21fe26f0f0629 (diff) | |
| parent | 53cf0b70c705e0bf6c09f83f2ce2709d79593ce6 (diff) | |
| download | otp-ec36499d7e329b4dc69a1a3be3422eac7907c260.tar.gz otp-ec36499d7e329b4dc69a1a3be3422eac7907c260.tar.bz2 otp-ec36499d7e329b4dc69a1a3be3422eac7907c260.zip | |
Merge branch 'dev' into major
Conflicts:
erts/aclocal.m4
erts/include/internal/ethread_header_config.h.in
Diffstat (limited to 'lib/cosFileTransfer/src')
| -rw-r--r-- | lib/cosFileTransfer/src/CosFileTransfer_FileTransferSession_impl.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/cosFileTransfer/src/CosFileTransfer_FileTransferSession_impl.erl b/lib/cosFileTransfer/src/CosFileTransfer_FileTransferSession_impl.erl index e222c5b92b..5dbe6f6b2f 100644 --- a/lib/cosFileTransfer/src/CosFileTransfer_FileTransferSession_impl.erl +++ b/lib/cosFileTransfer/src/CosFileTransfer_FileTransferSession_impl.erl @@ -792,7 +792,7 @@ target_FTS_operation(State, _SrcFile, DestFile, Op, Offset) -> %% Delete the temporary local copy. delete_tmp_file(TempName, "Transfer completed but failed to remove temporary local copy."), - %% Completed the transfer succesfully. + %% Completed the transfer successfully. {reply, ok, State}; {error, epath} -> delete_tmp_file(TempName, |