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

[eos/zephyr.git] / front-end / app / templates / workspace.html

diff --git a/front-end/app/templates/workspace.html b/front-end/app/templates/workspace.html
old mode 100644 (file)
new mode 100755 (executable)
index 9ac29f8..9e7f803
--- a/front-end/app/templates/workspace.html
+++ b/front-end/app/templates/workspace.html
@@ -2,6 +2,10 @@
 <div class="container">
     <div class="row">
         <button type="button" class="btn btn-info" ng-click="c.debug()">Debug</button>
+<<<<<<< HEAD
+        <button type="button" class="btn btn-info" ng-click="c.upload()">Upload</button>
+=======
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
         <directory index="i" info="info" list="c.directoryList" add="c.addDirectory" ng-repeat="(i, info) in c.directoryList"></directory>
     </div>
     <!-- <button type="button" class="btn btn-default" ng-click="c.test()">WORKSPACE</button> -->