github/shiny
1
1
Fork 0
mirror of https://github.com/rstudio/shiny.git synced 2026-04-29 03:00:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Enable union merge for NEWS

Browse Source
This commit is contained in:
Winston Chang
2014-07-16 16:48:56 -05:00
parent 972db08740
commit 6f1dc89fb3
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored Normal file
View File

@@ -0,0 +1 @@
/NEWS merge=union