chart views now use open legend renderer property instead of internal…

… one (ChartsOrg#3149)
kalmurzayev · Feb 26, 2018 · 359eb6c · 359eb6c
1 parent 277bb59
commit 359eb6c
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/Source/Charts/Charts/BarLineChartViewBase.swift b/Source/Charts/Charts/BarLineChartViewBase.swift
@@ -329,7 +329,14 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
                 max: xAxis._axisMaximum,
                 inverted: false)
 
+<<<<<<< 277bb5917868128dbe34a5a86c14ef91f9c8da39
             legendRenderer.computeLegend(data: data)
+=======
+            if _legend !== nil
+            {
+                legendRenderer?.computeLegend(data: data)
+            }
+>>>>>>> chart views now use open legend renderer property instead of internal one (#3149)
         }
 
         calculateOffsets()