diff options
author | flora edwards <floraedwards.student@wegc.school.nz> | 2015-01-15 06:08:18 +0300 |
---|---|---|
committer | flora edwards <floraedwards.student@wegc.school.nz> | 2015-01-15 06:08:18 +0300 |
commit | 4eb68958fd520ff51dd09d0c11bcf17dd809671c (patch) | |
tree | ff10847a6fc0c55ba4b0410c6a43d5d8e1e20ade /plugins/CoreVisualizations | |
parent | 38aa80d9cb356921075ab0e03438be2bf2fcb48e (diff) | |
parent | 9043f427470dbfb61aed29d1e0c80e2e70d3e51f (diff) |
merged conflic resolved
Diffstat (limited to 'plugins/CoreVisualizations')
-rw-r--r-- | plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php b/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php index da9a82ac75..1a41a07df3 100644 --- a/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php +++ b/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php @@ -61,4 +61,4 @@ class AllColumns extends HtmlTable $properties->columns_to_display = $columnsToDisplay; }); } -}
\ No newline at end of file +} |