[Asterisk-code-review] spelling: conflicts (asterisk[master])

[Josh Soref]

Josh Soref has uploaded this change for review. ( https://gerrit.asterisk.org/c/asterisk/+/16818 )


Change subject: spelling: conflicts
......................................................................

spelling: conflicts

Change-Id: I9298a940162ff4ead3e31da39982c3c9f9943ba8
---
M CHANGES
1 file changed, 1 insertion(+), 1 deletion(-)



  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/18/16818/1

diff --git a/CHANGES b/CHANGES
index 61d3c60..4574655 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3631,7 +3631,7 @@
    acts as a base framework that other modules can build on top of to allow
    an external system to control MWI within Asterisk. For implementations
    that make use of res_mwi_external, see res_mwi_external_ami and
-   res_ari_mailboxes. Note that res_mwi_external canflicts with other modules
+   res_ari_mailboxes. Note that res_mwi_external conflicts with other modules
    that may produce MWI themselves, such as app_voicemail. res_mwi_external
    and other modules that depend on it cannot be built or loaded with
    app_voicemail present.

-- 
To view, visit https://gerrit.asterisk.org/c/asterisk/+/16818
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Change-Id: I9298a940162ff4ead3e31da39982c3c9f9943ba8
Gerrit-Change-Number: 16818
Gerrit-PatchSet: 1
Gerrit-Owner: Josh Soref <jsoref at gmail.com>
Gerrit-CC: Friendly Automation
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20211107/fa3a6f6d/attachment.html>