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

[eos/zephyr.git] / front-end / app / scripts / services / APIEndPoint.ts

diff --git a/front-end/app/scripts/services/APIEndPoint.ts b/front-end/app/scripts/services/APIEndPoint.ts
index b0116e5..5280b8e 100755 (executable)
--- a/front-end/app/scripts/services/APIEndPoint.ts
+++ b/front-end/app/scripts/services/APIEndPoint.ts
@@ -33,7 +33,11 @@ namespace app.services {
         }
 
         public getFiles(fileId: string): ng.resource.IResource<declares.IResponse> {
+<<<<<<< HEAD
             var endPoint = '/api/v1/workspace';
+=======
+            var endPoint = '/api/v1/workspace'; 
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
 
             if(fileId) {
                 endPoint += '/' + fileId;
@@ -62,7 +66,11 @@ namespace app.services {
             var fd = new FormData()
             fd.append('data', data);
             return this.$http.post(endPoint,
+<<<<<<< HEAD
             fd,
+=======
+            fd, 
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
             {
                 headers: {'Content-Type': undefined },
                 transformRequest: angular.identity
@@ -73,12 +81,15 @@ namespace app.services {
             var endPoint = '/api/v1/debug';
             return this.$http.get(endPoint);
         }
+<<<<<<< HEAD
 
         public upload(): ng.IHttpPromise<string> {
           var endPoint = '/api/v1/upload';
           return this.$http.get(endPoint);
         }
         
+=======
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
         public help(command:string): ng.IHttpPromise<string> {
             var endPoint = '/api/v1/help/' + command;
             return this.$http.get(endPoint);