merge conflict resolved app.R updated
This commit is contained in:
@@ -5,6 +5,9 @@
|
||||
.Ruserdata
|
||||
.positai
|
||||
.png
|
||||
.DS_Store
|
||||
www/.DS_Store
|
||||
dev/www/.DS_Store
|
||||
man
|
||||
docs
|
||||
pkgdown
|
||||
|
||||
Reference in New Issue
Block a user