<p>to test, take two meshing nodes with Commotion 1.0, each advertising a single app. Upgrade with a build including these changes, keeping the settings. The uci-defaults script should update the UCI section name for each application.</p>

<p>Next, on node A, create a NEW application with the same URI as the app on node B. Node B should accept the new app from node A, and not overwrite its local app.</p>

<hr>

<h4>You can merge this Pull Request by running</h4>
<pre>  git pull https://github.com/opentechinstitute/luci-commotion-apps collision-fix</pre>
<p>Or view, comment on, or merge it at:</p>
<p>  <a href='https://github.com/opentechinstitute/luci-commotion-apps/pull/69'>https://github.com/opentechinstitute/luci-commotion-apps/pull/69</a></p>

<h4>Commit Summary</h4>
<ul>
  <li>added UCI defaults script to convert UCI entries</li>
  <li>updated openwrt makefile</li>
</ul>

<h4>File Changes</h4>
<ul>
  <li>
    <strong>M</strong>
    <a href="https://github.com/opentechinstitute/luci-commotion-apps/pull/69/files#diff-0">lua/luci/controller/commotion/apps_controller.lua</a>
    (14)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/opentechinstitute/luci-commotion-apps/pull/69/files#diff-1">openwrt/Makefile</a>
    (11)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/opentechinstitute/luci-commotion-apps/pull/69/files#diff-2">uci-defaults/luci-commotion-apps</a>
    (55)
  </li>
</ul>

<h4>Patch Links:</h4>
<ul>
  <li><a href='https://github.com/opentechinstitute/luci-commotion-apps/pull/69.patch'>https://github.com/opentechinstitute/luci-commotion-apps/pull/69.patch</a></li>
  <li><a href='https://github.com/opentechinstitute/luci-commotion-apps/pull/69.diff'>https://github.com/opentechinstitute/luci-commotion-apps/pull/69.diff</a></li>
</ul>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br>Reply to this email directly or <a href='https://github.com/opentechinstitute/luci-commotion-apps/pull/69'>view it on GitHub</a>.<img src='https://github.com/notifications/beacon/3074564__eyJzY29wZSI6Ik5ld3NpZXM6QmVhY29uIiwiZXhwaXJlcyI6MTcwODg5ODg5OCwiZGF0YSI6eyJpZCI6MjY0NDY3Njd9fQ==--380a60ec68bd5d831d181b73de2ee7d311e3bf00.gif' height='1' width='1'></p>