Repository: stratos Updated Branches: refs/heads/master 374e3fd5c -> 69ae30769
removing unwanted strings in tenant_management.js Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d5e42abb Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d5e42abb Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d5e42abb Branch: refs/heads/master Commit: d5e42abba074cd0d3c5254ab8a435388a2bf38d5 Parents: 48a6b2f Author: R-Rajkumar <[email protected]> Authored: Tue Aug 26 14:34:29 2014 +0530 Committer: R-Rajkumar <[email protected]> Committed: Tue Aug 26 14:34:29 2014 +0530 ---------------------------------------------------------------------- .../console/themes/theme1/renderers/tenant_management.js | 3 --- 1 file changed, 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/d5e42abb/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_management.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_management.js b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_management.js index 7be977a..2b86c90 100755 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_management.js +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/tenant_management.js @@ -84,12 +84,9 @@ var render = function (theme, data, meta, require) { name: 'Subscribe to Cartridge', class_name: 'btn-important' }, -<<<<<<< HEAD has_help:false, -======= bamInfo:data.bamInfo, has_help: true, ->>>>>>> 400 help: 'Create cartridges like PHP, Python, Ruby etc.. Or create data cartridges with mySql, PostgreSQL. Directly install applications like Drupal, Wordpress etc..' } }
