Skip to content

Commit 9cb7376

Browse files
timelyportfoliotimelyportfolio
committed
merge master and resolve conflicts
Merge branch 'master' into react-16-8-1 # Conflicts: # package.json # yarn.lock
2 parents 7c44747 + f6f8ac2 commit 9cb7376

File tree

9 files changed

+1224
-724
lines changed

9 files changed

+1224
-724
lines changed

‎.gitattributes‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/inst/www/react-tools/react-tools.js binary
2+
/inst/www/react-tools/react-tools.js.map binary

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@
55
inst/doc
66
node_modules
77
reactR.Rcheck
8-
reactR_*.tar.gz
8+
reactR_*.tar.gz
9+
*.swp

‎inst/www/react-tools/react-tools.js‎

Lines changed: 219 additions & 109 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)