summaryrefslogtreecommitdiff
path: root/gstudio/templates/gstudio/skeleton.html
diff options
context:
space:
mode:
authorhorntail <nktsrd@gmail.com>2012-07-13 15:33:00 +0530
committerhorntail <nktsrd@gmail.com>2012-07-13 15:33:00 +0530
commit253a7a23f71fd90e9f70a89b6a0aad6312ef4d40 (patch)
treeaade34552216e94820c49aab0f52ad94316b8ec7 /gstudio/templates/gstudio/skeleton.html
parentf3dc110be252dc51d0ce938c4be655d4453de4cf (diff)
parent25261ae70442eabc1b26ddfbbd923b04a3ffb9f1 (diff)
downloadgnowsys-253a7a23f71fd90e9f70a89b6a0aad6312ef4d40.tar.gz
Merge remote-tracking branch 'gn/master'
Diffstat (limited to 'gstudio/templates/gstudio/skeleton.html')
-rw-r--r--gstudio/templates/gstudio/skeleton.html1
1 files changed, 1 insertions, 0 deletions
diff --git a/gstudio/templates/gstudio/skeleton.html b/gstudio/templates/gstudio/skeleton.html
index 8f5c30d..5820701 100644
--- a/gstudio/templates/gstudio/skeleton.html
+++ b/gstudio/templates/gstudio/skeleton.html
@@ -415,6 +415,7 @@ function load(key)
}
fill = d3.scale.category20();
+>>>>>>> 184877f00ded7fe61420111de4ec8d48d3bee634
var vis = d3.select("#chart")
.append("svg:svg")
.attr("id", "amazingViz")