You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@echarts.apache.org by su...@apache.org on 2019/01/12 21:55:30 UTC

[incubator-echarts] 05/05: Merge branch 'release'

This is an automated email from the ASF dual-hosted git repository.

sushuang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git

commit 856a28568a5134b6ab1b3b40745e5e34ba69cb46
Merge: e0393f2 8dad11f
Author: sushuang <su...@gmail.com>
AuthorDate: Sun Jan 13 05:54:46 2019 +0800

    Merge branch 'release'
    
    # Conflicts:
    #	src/chart/pie/labelLayout.js
    #	src/chart/sunburst/SunburstPiece.js

 src/chart/sunburst/SunburstPiece.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org