Fix merge conflict code #97
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
krissalvador27
force-pushed
the
fix-merge-conflict-code
branch
from
e58255e to
0622acc
Compare
krissalvador27
force-pushed
the
fix-merge-conflict-code
branch
from
0622acc to
d579a40
Compare
krissalvador27
pushed a commit
that referenced
this pull request
Jul 6, 2018
* Remove legacy return from RangeBarChart (#93) * Remove legacy return from RangeBarChart * Lint fix * Minor bug fixes (#94) * Fix ScatterPlot pointStyle propType * Fix proptypes for XAxis and YAxis labels * Add test for label formatting * Rebuild docs * Fix docs for treemap and sankey diagram and rebuild docs * v1.0.1 release (#95) * Fix merge conflict code (#97)
krissalvador27
pushed a commit
that referenced
this pull request
Aug 28, 2018
* Remove legacy return from RangeBarChart (#93) * Remove legacy return from RangeBarChart * Lint fix * Minor bug fixes (#94) * Fix ScatterPlot pointStyle propType * Fix proptypes for XAxis and YAxis labels * Add test for label formatting * Rebuild docs * Fix docs for treemap and sankey diagram and rebuild docs * v1.0.1 release (#95) * Fix merge conflict code (#97) * Add d3 line generator and curve prop to LineChart (#99) * Fix growl dependency, recreate package-lock.json (#100) * Add offset prop to x and y labels (#102) * Add offset prop to x and y labels * Update axis test * Update documentation * Fix issue with TreeMap and react-docgen issues. Regenerate docs (#103) * v1.1.0 release (#104)
krissalvador27
pushed a commit
that referenced
this pull request
Aug 29, 2018
* Remove legacy return from RangeBarChart (#93) * Remove legacy return from RangeBarChart * Lint fix * Minor bug fixes (#94) * Fix ScatterPlot pointStyle propType * Fix proptypes for XAxis and YAxis labels * Add test for label formatting * Rebuild docs * Fix docs for treemap and sankey diagram and rebuild docs * v1.0.1 release (#95) * Fix merge conflict code (#97) * Add d3 line generator and curve prop to LineChart (#99) * Fix growl dependency, recreate package-lock.json (#100) * Add offset prop to x and y labels (#102) * Add offset prop to x and y labels * Update axis test * Update documentation * Fix issue with TreeMap and react-docgen issues. Regenerate docs (#103) * v1.1.0 release (#104) * Add show line prop and default style for X and Y Axis (#106) * Add show line prop and default style for xaxis * Regenerated docs * 1.2.0 release (#107)
krissalvador27
pushed a commit
that referenced
this pull request
Aug 30, 2018
* Remove legacy return from RangeBarChart (#93) * Remove legacy return from RangeBarChart * Lint fix * Minor bug fixes (#94) * Fix ScatterPlot pointStyle propType * Fix proptypes for XAxis and YAxis labels * Add test for label formatting * Rebuild docs * Fix docs for treemap and sankey diagram and rebuild docs * v1.0.1 release (#95) * Fix merge conflict code (#97) * Add d3 line generator and curve prop to LineChart (#99) * Fix growl dependency, recreate package-lock.json (#100) * Add offset prop to x and y labels (#102) * Add offset prop to x and y labels * Update axis test * Update documentation * Fix issue with TreeMap and react-docgen issues. Regenerate docs (#103) * v1.1.0 release (#104) * Add show line prop and default style for X and Y Axis (#106) * Add show line prop and default style for xaxis * Regenerated docs * 1.2.0 release (#107) * Add curve prop to AreaChart for changing curve type (#109) * Add curve prop to AreaChart for changing curve type * Make curve to AreaChart optional * feature(version): bump version for curve
krissalvador27
pushed a commit
that referenced
this pull request
Aug 31, 2018
* Remove legacy return from RangeBarChart (#93) * Remove legacy return from RangeBarChart * Lint fix * Minor bug fixes (#94) * Fix ScatterPlot pointStyle propType * Fix proptypes for XAxis and YAxis labels * Add test for label formatting * Rebuild docs * Fix docs for treemap and sankey diagram and rebuild docs * v1.0.1 release (#95) * Fix merge conflict code (#97) * Add d3 line generator and curve prop to LineChart (#99) * Fix growl dependency, recreate package-lock.json (#100) * Add offset prop to x and y labels (#102) * Add offset prop to x and y labels * Update axis test * Update documentation * Fix issue with TreeMap and react-docgen issues. Regenerate docs (#103) * v1.1.0 release (#104) * Add show line prop and default style for X and Y Axis (#106) * Add show line prop and default style for xaxis * Regenerated docs * 1.2.0 release (#107) * Add curve prop to AreaChart for changing curve type (#109) * Add curve prop to AreaChart for changing curve type * Make curve to AreaChart optional * feature(version): bump version for curve * Fix broken docs and update version (#111)
install
pushed a commit
that referenced
this pull request
Feb 25, 2020
install
pushed a commit
that referenced
this pull request
Feb 25, 2020
* Remove legacy return from RangeBarChart (#93) * Remove legacy return from RangeBarChart * Lint fix * Minor bug fixes (#94) * Fix ScatterPlot pointStyle propType * Fix proptypes for XAxis and YAxis labels * Add test for label formatting * Rebuild docs * Fix docs for treemap and sankey diagram and rebuild docs * v1.0.1 release (#95) * Fix merge conflict code (#97)
install
pushed a commit
that referenced
this pull request
Feb 25, 2020
* Remove legacy return from RangeBarChart (#93) * Remove legacy return from RangeBarChart * Lint fix * Minor bug fixes (#94) * Fix ScatterPlot pointStyle propType * Fix proptypes for XAxis and YAxis labels * Add test for label formatting * Rebuild docs * Fix docs for treemap and sankey diagram and rebuild docs * v1.0.1 release (#95) * Fix merge conflict code (#97) * Add d3 line generator and curve prop to LineChart (#99) * Fix growl dependency, recreate package-lock.json (#100) * Add offset prop to x and y labels (#102) * Add offset prop to x and y labels * Update axis test * Update documentation * Fix issue with TreeMap and react-docgen issues. Regenerate docs (#103) * v1.1.0 release (#104)
install
pushed a commit
that referenced
this pull request
Feb 25, 2020
* Remove legacy return from RangeBarChart (#93) * Remove legacy return from RangeBarChart * Lint fix * Minor bug fixes (#94) * Fix ScatterPlot pointStyle propType * Fix proptypes for XAxis and YAxis labels * Add test for label formatting * Rebuild docs * Fix docs for treemap and sankey diagram and rebuild docs * v1.0.1 release (#95) * Fix merge conflict code (#97) * Add d3 line generator and curve prop to LineChart (#99) * Fix growl dependency, recreate package-lock.json (#100) * Add offset prop to x and y labels (#102) * Add offset prop to x and y labels * Update axis test * Update documentation * Fix issue with TreeMap and react-docgen issues. Regenerate docs (#103) * v1.1.0 release (#104) * Add show line prop and default style for X and Y Axis (#106) * Add show line prop and default style for xaxis * Regenerated docs * 1.2.0 release (#107)
install
pushed a commit
that referenced
this pull request
Feb 25, 2020
* Remove legacy return from RangeBarChart (#93) * Remove legacy return from RangeBarChart * Lint fix * Minor bug fixes (#94) * Fix ScatterPlot pointStyle propType * Fix proptypes for XAxis and YAxis labels * Add test for label formatting * Rebuild docs * Fix docs for treemap and sankey diagram and rebuild docs * v1.0.1 release (#95) * Fix merge conflict code (#97) * Add d3 line generator and curve prop to LineChart (#99) * Fix growl dependency, recreate package-lock.json (#100) * Add offset prop to x and y labels (#102) * Add offset prop to x and y labels * Update axis test * Update documentation * Fix issue with TreeMap and react-docgen issues. Regenerate docs (#103) * v1.1.0 release (#104) * Add show line prop and default style for X and Y Axis (#106) * Add show line prop and default style for xaxis * Regenerated docs * 1.2.0 release (#107) * Add curve prop to AreaChart for changing curve type (#109) * Add curve prop to AreaChart for changing curve type * Make curve to AreaChart optional * feature(version): bump version for curve
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.