From 632d743697fa2577b1f6f1e1794872e772a85192 Mon Sep 17 00:00:00 2001 From: parag00991 Date: Wed, 20 Apr 2016 17:09:00 +0530 Subject: [PATCH] merging of root with any other node- fixes #46 and #80 --- html/js/tree/Tree.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/js/tree/Tree.js b/html/js/tree/Tree.js index 4d4ecff..aa4b36c 100644 --- a/html/js/tree/Tree.js +++ b/html/js/tree/Tree.js @@ -758,7 +758,7 @@ GTE.TREE = (function (parentModule) { } else if (this.iSetsSharePathFromRoot(a, b)) { window.alert("Couldn't merge the information sets." + "Please select two information sets that do not share a path from root."); - } else if (a.firstNode === this.root && b.firstNode === this.root) { + } else if (a.firstNode === this.root || b.firstNode === this.root) { window.alert("Couldn't merge the information sets." + "Please select two information sets that do not share a path from root."); }else {