Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added fillColor for charts (only xlsx) #158

Closed
wants to merge 8 commits into from
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove conflict comments
  • Loading branch information
CrazyBite committed May 17, 2017
commit 64deb5fc82652891ad76ef920e6a761b171aa3c9
3 changes: 0 additions & 3 deletions src/PhpSpreadsheet/Chart/DataSeriesValues.php
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,9 @@ class DataSeriesValues
private $dataValues = [];

/**
<<<<<<< HEAD
* Create a new DataSeriesValues object.
*
* @param mixed $dataType
=======
* Fill color.
*
* @var string
Expand All @@ -90,7 +88,6 @@ class DataSeriesValues

/**
* Create a new DataSeriesValues object
>>>>>>> aea557bd70f6e4ac13ca625c342fce26ad544331
* @param string $dataSource
* @param null|mixed $formatCode
* @param mixed $pointCount
Expand Down