Merge branch 'master' of git.osdn.net:/gitroot/eos/zephyr

[eos/zephyr.git] / front-end / dist / templates / command.html

diff --git a/front-end/dist/templates/command.html b/front-end/dist/templates/command.html
index c25eb83..56da121 100755 (executable)
--- a/front-end/dist/templates/command.html
+++ b/front-end/dist/templates/command.html
@@ -19,11 +19,19 @@
                     Execute
                 </button>
                 <button type="button" class="btn btn-default">
+<<<<<<< HEAD
                     Stop
                 </button>
                 <button type="button" class="btn btn-default"
                                       ng-click="ctrl.help()">
                     Help
+=======
+                    Stop 
+                </button>
+                <button type="button" class="btn btn-default"
+                                      ng-click="ctrl.help()">
+                    Help 
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
                 </button>
                 <button type="button" class="btn btn-default" ng-click="ctrl.debug()">
                     debug