resolve conflicts

This commit is contained in:
n3hrox
2019-11-04 20:52:24 +01:00
parent 82b69a5abd
commit 952fee57c1
49 changed files with 360 additions and 322 deletions
+17 -7
View File
@@ -1,9 +1,19 @@
* [ ] Have you followed the guidelines in our
[Contributing document](https://dvc.org/doc/user-guide/contributing/core)?
* [ ] ❗ Have you followed the guidelines in the
[Contributing to DVC](https://dvc.org/doc/user-guide/contributing/core)
list?
* [ ] Does your PR affect documented changes or does it add new functionality
that should be documented? If yes, have you created a PR for
[dvc.org](https://github.com/iterative/dvc.org) documenting it or at
least opened an issue for it? If so, please add a link to it.
* [ ] 📖 Check this box if this PR **does not** require
[documentation](https://dvc.org/doc) updates, or if it does **and** you
have created a separate PR in
[dvc.org](https://github.com/iterative/dvc.org)
with such updates (or at least opened an issue about it in that repo).
Please link below to your PR (or issue) in the
[dvc.org](https://github.com/iterative/dvc.org) repo.
* [ ] ❌ Have you checked DeepSource, CodeClimate, and other sanity checks
below? We consider their findings recommendatory and don't expect
everything to be addresses. Please review them carefully and fix those
that actually improve code or fix bugs.
Thank you for the contribution - we'll try to review it as soon as possible. 🙏
-----
+5
View File
@@ -0,0 +1,5 @@
# Config for https://github.com/apps/release-drafter
branches:
- master
template: |
$CHANGES