about summary refs log tree commit diff
path: root/sourcecodes/layout_cyto.php
diff options
context:
space:
mode:
authorziejd22021-10-11 16:00:02 -0500
committerziejd22021-10-11 16:00:02 -0500
commit566a4de3fcc9b90da036dbf385044319c11a2b6a (patch)
tree15c23be0643f41128f11cf9bb378ed505e259a6b /sourcecodes/layout_cyto.php
parenta20784bad5cfa214ce23d16695d0064571bae9c3 (diff)
parent73ba58868451b5fc6611e1feaa9b63f17b6cd19d (diff)
downloadBNW-566a4de3fcc9b90da036dbf385044319c11a2b6a.tar.gz
Resolved merge conflict
Diffstat (limited to 'sourcecodes/layout_cyto.php')
-rw-r--r--sourcecodes/layout_cyto.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/sourcecodes/layout_cyto.php b/sourcecodes/layout_cyto.php
index b939f79a..0e512345 100644
--- a/sourcecodes/layout_cyto.php
+++ b/sourcecodes/layout_cyto.php
@@ -104,8 +104,8 @@ var default_layout = { name: 'dagre',
 		       spacingFactor: 1.25
   }
 
-  $.getJSON("<?php print($input_json);?>",function (data) {
-  //$.getJSON("./data/cwHnetwork.json",function (data) {
+  //$.getJSON("<?php print($input_json);?>",function (data) {
+  $.getJSON("./data/sample_network.json",function (dumm) {
       //    console.log(data);
     //     document.addEventListener('DOMContentLoaded', function(){
       var cy = window.cy = cytoscape({