summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJosh Soref <jsoref@users.noreply.github.com>2019-02-12 11:54:32 -0500
committerJosh Soref <jsoref@users.noreply.github.com>2019-02-12 11:54:32 -0500
commit2863787ff97dafb5d24122809566d551a9674be7 (patch)
tree2a0af07d6544c2265abfea34648bba131c38893f /src
parentc8b2b4f78f608bd03023c87f09ac949d61d9fb8b (diff)
downloadrabbitmq-server-git-2863787ff97dafb5d24122809566d551a9674be7.tar.gz
spelling: conflicts
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_guid.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rabbit_guid.erl b/src/rabbit_guid.erl
index 6f03a1a04f..5728ac88d7 100644
--- a/src/rabbit_guid.erl
+++ b/src/rabbit_guid.erl
@@ -92,7 +92,7 @@ advance_blocks({B1, B2, B3, B4}, I) ->
%% hashing {B5, I}. The new hash is used as last block, and the
%% other three blocks are XORed with it.
%%
- %% Doing this is convenient because it avoids cascading conflits,
+ %% Doing this is convenient because it avoids cascading conflicts,
%% while being very fast. The conflicts are avoided by propagating
%% the changes through all the blocks at each round by XORing, so
%% the only occasion in which a collision will take place is when