fix: conflicts

This commit is contained in:
Rucha Mahabal
2020-02-27 13:16:53 +05:30
parent e29d5c1d5b
commit 99321cd538
444 changed files with 15057 additions and 10826 deletions

16
.github/workflows/backport.yml vendored Normal file
View File

@@ -0,0 +1,16 @@
name: Backport
on:
pull_request:
types:
- closed
- labeled
jobs:
backport:
runs-on: ubuntu-18.04
name: Backport
steps:
- name: Backport
uses: tibdex/backport@v1
with:
github_token: ${{ secrets.GITHUB_TOKEN }}