senaduka/old-lab_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved merge conflicts

Browse Source
This commit is contained in:
Rohit Nandwani
2019-06-20 10:53:57 -04:00
parent 3c40bc3935 5c8f822b92
commit fddc249090
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/app/components/coordinator/coordinator.html
View File

@@ -456,7 +456,7 @@
</div> </div>
<div class="action-button panel-footer"> <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 Fix Errors
</button> </button>
</div> </div>