Browse Source

deleted some parts that remained from conflict

master
nglk 4 years ago
parent
commit
e4e4b14642
  1. 5
      wells/index.html
  2. 1
      wells/static/js/d3_map.js

5
wells/index.html

@ -174,8 +174,7 @@ $("#about").click(function(){
</script> </script>
<<<<<<< HEAD
=======
<!-- scaleable wrapper --> <!-- scaleable wrapper -->
<!-- <script> <!-- <script>
var $el = $("#thesis"); var $el = $("#thesis");
@ -211,7 +210,7 @@ size: {
} }
doResize(null, starterData); doResize(null, starterData);
</script> --> </script> -->
>>>>>>> f589ef5ab8aff787a3421ad0701fb57769be1f4c
</div> </div>
</body> </body>

1
wells/static/js/d3_map.js

@ -76,7 +76,6 @@ var divBio = d3.select("body").append("div").style("opacity", 1);
force.on("tick", function() { force.on("tick", function() {
link.attr("x1", function(d) { return d.source.x; }) link.attr("x1", function(d) { return d.source.x; })
.attr("y1", function(d) { return d.source.y; }) .attr("y1", function(d) { return d.source.y; })

Loading…
Cancel
Save