kylin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shaofeng...@apache.org
Subject kylin git commit: fix merge error
Date Thu, 15 Sep 2016 04:44:16 GMT
Repository: kylin
Updated Branches:
  refs/heads/kylin-1.5.4-cdh5.7-release 63a5a0cf5 -> e805b5410


fix merge error


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/e805b541
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/e805b541
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/e805b541

Branch: refs/heads/kylin-1.5.4-cdh5.7-release
Commit: e805b54109ca7337b91764086aa87130dec72c50
Parents: 63a5a0c
Author: shaofengshi <shaofengshi@apache.org>
Authored: Thu Sep 15 12:44:17 2016 +0800
Committer: shaofengshi <shaofengshi@apache.org>
Committed: Thu Sep 15 12:44:17 2016 +0800

----------------------------------------------------------------------
 webapp/app/js/controllers/cubeMeasures.js | 11 -----------
 1 file changed, 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/e805b541/webapp/app/js/controllers/cubeMeasures.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubeMeasures.js b/webapp/app/js/controllers/cubeMeasures.js
index 4f2627e..e4e749d 100644
--- a/webapp/app/js/controllers/cubeMeasures.js
+++ b/webapp/app/js/controllers/cubeMeasures.js
@@ -30,17 +30,6 @@ KylinApp.controller('CubeMeasuresCtrl', function ($scope, $modal,MetaModel,cubes
   };
   $scope.initUpdateMeasureStatus();
 
-<<<<<<< 5bc3830dbf3f6da0daebd05df8a24b735e40dd98
-=======
-  $scope.initUpdateMeasureStatus = function(){
-    $scope.updateMeasureStatus = {
-      isEdit:false,
-      editIndex:-1
-    }
-  };
-  $scope.initUpdateMeasureStatus();
-
->>>>>>> KYLIN-1786 extended column UI update
   $scope.addNewMeasure = function (measure, index) {
     if(measure&&index>=0){
       $scope.updateMeasureStatus.isEdit = true;


Mime
View raw message