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

[eos/zephyr.git] / front-end / app / scripts / controllers / Preview.ts

diff --git a/front-end/app/scripts/controllers/Preview.ts b/front-end/app/scripts/controllers/Preview.ts
index e5aff4d..3f399d9 100755 (executable)
--- a/front-end/app/scripts/controllers/Preview.ts
+++ b/front-end/app/scripts/controllers/Preview.ts
@@ -1,5 +1,9 @@
 namespace app.controllers {
+<<<<<<< HEAD
     export class Preview { 
+=======
+    export class Preview{ 
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
 
         public static $inject = ['$scope', 'APIEndPoint','$uibModalInstance'];
         private tags: string[];
@@ -14,12 +18,20 @@ namespace app.controllers {
             this.APIEndPoint
                 .getCommands()
                 .$promise.then((result) => {
+<<<<<<< HEAD
                    controller.commands = result.info;
+=======
+                   controller.commands = result.info; 
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
                 });
             this.currentTag = 'all';
             */
 
+<<<<<<< HEAD
         }
+=======
+        } 
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
 
     }
 }