Files
shiny/.gitattributes
2015-04-23 11:53:31 -05:00

5 lines
101 B
Plaintext

/NEWS merge=union
/inst/www/shared/shiny.js -merge -diff
*.min.js -merge -diff
*.js.map -merge -diff