Resolved merge conflict

1 files changed, 11 insertions, 0 deletions

diff --git a/sourcecodes/layout_svg_no.php b/sourcecodes/layout_svg_no.php
index f7268788..89f6ffbb 100644
--- a/sourcecodes/layout_svg_no.php
+++ b/sourcecodes/layout_svg_no.php
@@ -112,10 +112,21 @@ if(file_exists($filename1))
 
 
   //onload = "makeDraggable(evt)";
+<<<<<<< HEAD
 
 d3.xml("<?php print($svg_file);?>", function(error, documentFragment){
   if (error) {console.log(error); return;}
   
+=======
+<?php
+$svg_xml = json_encode(file("file://".$dir.$svg_file));
+?>
+d3.xml("", function(dumm){
+ var data1 = <?php echo $svg_xml;?>;
+ var data2 = data1.join(""); 
+ parser = new DOMParser();
+ documentFragment = parser.parseFromString(data2,"text/xml");
+>>>>>>> genenet8_initial_1.3
  var svgNode = documentFragment
     .getElementsByTagName("svg")[0];