Browse code

git conflict

guangchuang yu authored on 17/08/2017 08:10:06
Showing2 changed files

... ...
@@ -83,6 +83,7 @@ gitmaintain:
83 83
 	git prune -v;\
84 84
 	git fsck --full
85 85
 
86
+
86 87
 push:
87 88
 	git push -u origin master;\
88 89
 	git checkout bioc;\
... ...
@@ -43,7 +43,6 @@ library("yyplot")
43 43
 [![Sponsors on Open Collective](https://opencollective.com/ggtree/sponsors/badge.svg)](#sponsors)
44 44
 
45 45
 
46
-
47 46
 The `ggtree` package extending the `ggplot2` package. It based on grammar of graphics and takes all the good parts of `ggplot2`. `ggtree` is designed for not only viewing phylogenetic tree but also displaying annotation data on the tree.
48 47
 
49 48
 [![Twitter](https://img.shields.io/twitter/url/https/github.com/GuangchuangYu/ggtree.svg?style=social)](https://twitter.com/intent/tweet?hashtags=ggtree&url=http://onlinelibrary.wiley.com/doi/10.1111/2041-210X.12628/abstract&screen_name=guangchuangyu)
... ...
@@ -91,7 +90,6 @@ ggsave(p, file="docs/images/citation.png", width=8, height=4)
91 90
 `r badge_bioc_download("ggtree", "month", "blue")`
92 91
 
93 92
 
94
-
95 93
 ```{r echo=F, message=F, comment=NA}
96 94
 x <- dlstats::bioc_stats("ggtree")
97 95
 x <- x[-nrow(x), ] # last month data is not complete
... ...
@@ -121,6 +119,7 @@ Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com
121 119
 
122 120
 Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/ggtree#sponsor)]
123 121
 
122
+
124 123
 <a href="https://opencollective.com/ggtree/sponsor/0/website" target="_blank"><img src="https://opencollective.com/ggtree/sponsor/0/avatar.svg"></a>
125 124
 <a href="https://opencollective.com/ggtree/sponsor/1/website" target="_blank"><img src="https://opencollective.com/ggtree/sponsor/1/avatar.svg"></a>
126 125
 <a href="https://opencollective.com/ggtree/sponsor/2/website" target="_blank"><img src="https://opencollective.com/ggtree/sponsor/2/avatar.svg"></a>
... ...
@@ -134,4 +133,3 @@ Support this project by becoming a sponsor. Your logo will show up here with a l
134 133
 
135 134
 
136 135
 
137
-