You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2016/09/15 04:42:17 UTC
kylin git commit: fix merge error
Repository: kylin
Updated Branches:
refs/heads/kylin-1.5.4-HBase1.x-release 7b8adacb1 -> f36405d83
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/f36405d8
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/f36405d8
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/f36405d8
Branch: refs/heads/kylin-1.5.4-HBase1.x-release
Commit: f36405d83356231cc3246065a6d5b3cb6500e6b1
Parents: 7b8adac
Author: shaofengshi <sh...@apache.org>
Authored: Thu Sep 15 12:42:17 2016 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Thu Sep 15 12:42: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/f36405d8/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;