summaryrefslogtreecommitdiff
path: root/gstudio/templates/gstudio/skeleton.html
diff options
context:
space:
mode:
Diffstat (limited to 'gstudio/templates/gstudio/skeleton.html')
-rw-r--r--gstudio/templates/gstudio/skeleton.html1
1 files changed, 0 insertions, 1 deletions
diff --git a/gstudio/templates/gstudio/skeleton.html b/gstudio/templates/gstudio/skeleton.html
index 5820701..8f5c30d 100644
--- a/gstudio/templates/gstudio/skeleton.html
+++ b/gstudio/templates/gstudio/skeleton.html
@@ -415,7 +415,6 @@ function load(key)
}
fill = d3.scale.category20();
->>>>>>> 184877f00ded7fe61420111de4ec8d48d3bee634
var vis = d3.select("#chart")
.append("svg:svg")
.attr("id", "amazingViz")