deletions | additions       diff --git a/panel_test.html b/panel_test.html  index 9ec984a..fc1fc69 100644  --- a/panel_test.html  +++ b/panel_test.html 
...
  });    <<<<<<< HEAD  d3.csv("data/sample_data_cut.csv", function(error, csv_data) {  var nRows = current_state['grid']['nRows'],  nCols = current_state['grid']['nColumns'];  console.log(csv_data[0]);  var svg_height = nRows*(plot_size + padding),  svg_width = nCols*(plot_size + padding);   
...
});       

sdghldkjfgh

 

lzdkjhgfdsl