diff options
Diffstat (limited to 'gstudio/templates')
| -rw-r--r-- | gstudio/templates/gstudio/skeleton.html | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gstudio/templates/gstudio/skeleton.html b/gstudio/templates/gstudio/skeleton.html index 8716969..170c898 100644 --- a/gstudio/templates/gstudio/skeleton.html +++ b/gstudio/templates/gstudio/skeleton.html @@ -1,3 +1,6 @@ +<<<<<<< HEAD + +======= {% load gstudio_tags i18n %} {% get_tags as nodetype_tags %} {% load adminmedia grp_tags %} @@ -408,6 +411,7 @@ function load(key) } fill = d3.scale.category20(); +>>>>>>> 184877f00ded7fe61420111de4ec8d48d3bee634 var vis = d3.select("#chart") .append("svg:svg") .attr("id", "amazingViz") |