You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2015/07/14 18:38:14 UTC
[09/40] airavata-php-gateway git commit: fixing merge conflict
fixing merge conflict
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/7813be1b
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/7813be1b
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/7813be1b
Branch: refs/heads/0.15-release-branch
Commit: 7813be1b2362fadcf418bd859f7b34b42463a6d1
Parents: 01a69b7
Author: Supun Nakandala <sc...@apache.org>
Authored: Sat Jun 6 15:39:45 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Sat Jun 6 15:39:45 2015 +0530
----------------------------------------------------------------------
app/views/admin/manage-experiments.blade.php | 9 ---------
1 file changed, 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/7813be1b/app/views/admin/manage-experiments.blade.php
----------------------------------------------------------------------
diff --git a/app/views/admin/manage-experiments.blade.php b/app/views/admin/manage-experiments.blade.php
index 05be87d..6654a17 100644
--- a/app/views/admin/manage-experiments.blade.php
+++ b/app/views/admin/manage-experiments.blade.php
@@ -408,10 +408,6 @@ to be uncommented when actually in use.
$(".add-tenant").slideDown();
});
-<<<<<<< HEAD
-=======
-
->>>>>>> ee45c04d94e2cc3daec69dfeaf2651c353df2d64
$('.tree li:has(ul)').addClass('parent_li').find(' > span').attr('title', 'Collapse this branch');
$('.tree li.parent_li > span').on('click', function (e) {
var children = $(this).parent('li.parent_li').find(' > ul > li');
@@ -425,13 +421,8 @@ to be uncommented when actually in use.
e.stopPropagation();
});
-<<<<<<< HEAD
- $(".get-experiment").click(function () {
- $(".loading-img").removeClass("hide");
-=======
$('.get-experiment').on('click', function (e) {
$('.loading-img').removeClass('hide');
->>>>>>> ee45c04d94e2cc3daec69dfeaf2651c353df2d64
$.ajax({
url: 'experiment/summary?expId=' + $(".experimentId").val(),
type: 'get',