Skip to content

Travis build fix#2514

Merged
mdietze merged 8 commits intodevelopfrom
no-inherit-base-doc
Jan 10, 2020
Merged

Travis build fix#2514
mdietze merged 8 commits intodevelopfrom
no-inherit-base-doc

Conversation

@infotroph
Copy link
Copy Markdown
Member

Combines #2511 and #2513 to make sure they combine to get a passing Travis build

Description

Motivation and Context

Review Time Estimate

  • Immediately
  • Within one week
  • When possible

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My change requires a change to the documentation.
  • I have updated the CHANGELOG.md.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

rahul799 and others added 8 commits January 10, 2020 00:16
Co-Authored-By: Alexey Shiklomanov <alexey.shiklomanov@gmail.com>
Co-Authored-By: Chris Black <chris@ckblack.org>
Co-Authored-By: Chris Black <chris@ckblack.org>
The documentation for base::list.files changed in R 3.6.2, making Roxygen output differ between R versions
…dependency

fixes-#2509-Removed-ncdf4.helpers-dependency
@mdietze mdietze merged commit 351946e into develop Jan 10, 2020
@infotroph infotroph deleted the no-inherit-base-doc branch January 10, 2020 18:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants