resolved merge conflicts

This commit is contained in:
Rohit Nandwani
2019-06-20 10:53:57 -04:00

View File

@@ -456,7 +456,7 @@
</div>
<div class="action-button panel-footer">
<button id="right_fixFrankaButton" type="button" onclick="triggerService('/left/aescape/hardware/resetFrankaError')" class="btn">
<button id="right_fixFrankaButton" type="button" onclick="triggerService('/right/aescape/hardware/resetFrankaError')" class="btn">
Fix Errors
</button>
</div>