Browse code

.Rbuildignore

guangchuang yu authored on 20/07/2017 07:54:58
Showing1 changed files

... ...
@@ -11,9 +11,7 @@ mkdocs
11 11
 docs
12 12
 logo.png.github
13 13
 .github
14
-<<<<<<< HEAD
15 14
 ^.*\.Rproj$
16 15
 ^\.Rproj\.user$
17
-=======
18 16
 ggtree_sticker.R
19
->>>>>>> 6c3d0a213ebba123a58af768ef6d7b4ec93b85d1
17
+