X-Git-Url: http://git.osdn.net/view?p=eos%2Fzephyr.git;a=blobdiff_plain;f=front-end%2Fdist%2Ftemplates%2Fcommand.html;h=56da12118f63284151e64e68ef90f930f68ed218;hp=c25eb833cd027f021878a6751e361feff692e859;hb=878d6ee413e58a8f7dcfb77c1bbc9c3e7a3afc55;hpb=7b1bc4ddf4aa062beb296ae669e08689f2c80305

diff --git a/front-end/dist/templates/command.html b/front-end/dist/templates/command.html
index c25eb83..56da121 100755
--- 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