<p>Josh Soref has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/16818">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">spelling: conflicts<br><br>Change-Id: I9298a940162ff4ead3e31da39982c3c9f9943ba8<br>---<br>M CHANGES<br>1 file changed, 1 insertion(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/18/16818/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/CHANGES b/CHANGES</span><br><span>index 61d3c60..4574655 100644</span><br><span>--- a/CHANGES</span><br><span>+++ b/CHANGES</span><br><span>@@ -3631,7 +3631,7 @@</span><br><span>    acts as a base framework that other modules can build on top of to allow</span><br><span>    an external system to control MWI within Asterisk. For implementations</span><br><span>    that make use of res_mwi_external, see res_mwi_external_ami and</span><br><span style="color: hsl(0, 100%, 40%);">-   res_ari_mailboxes. Note that res_mwi_external canflicts with other modules</span><br><span style="color: hsl(120, 100%, 40%);">+   res_ari_mailboxes. Note that res_mwi_external conflicts with other modules</span><br><span>    that may produce MWI themselves, such as app_voicemail. res_mwi_external</span><br><span>    and other modules that depend on it cannot be built or loaded with</span><br><span>    app_voicemail present.</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/16818">change 16818</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/16818"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I9298a940162ff4ead3e31da39982c3c9f9943ba8 </div>
<div style="display:none"> Gerrit-Change-Number: 16818 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Josh Soref <jsoref@gmail.com> </div>
<div style="display:none"> Gerrit-CC: Friendly Automation </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>