From dcdd65ea8f43f9fff3d585871d38afeae884ed08 Mon Sep 17 00:00:00 2001
From: nagarjun <nagarjun@gnowledge.org>
Date: Fri, 13 Jul 2012 16:19:00 +0530
Subject: changes in urls of Chatstudio, deletion of a line in skeleton.html of
 gstudio

---
 gstudio/templates/gstudio/skeleton.html | 1 -
 1 file changed, 1 deletion(-)

(limited to 'gstudio/templates/gstudio/skeleton.html')

diff --git a/gstudio/templates/gstudio/skeleton.html b/gstudio/templates/gstudio/skeleton.html
index 5820701a..8f5c30dc 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") 
-- 
cgit v1.2.3-70-g09d2