diff options
| author | Yobmod <yobmod@gmail.com> | 2021-06-17 17:29:37 +0100 |
|---|---|---|
| committer | Yobmod <yobmod@gmail.com> | 2021-06-17 17:29:37 +0100 |
| commit | 636f77bf8d58a482df0bde8c0a6a8828950a0788 (patch) | |
| tree | e1207dbe034f82deacbb76369716779608e7056d /.travis.yml | |
| parent | 567c892322776756e8d0095e89f39b25b9b01bc2 (diff) | |
| parent | b0f79c58ad919e90261d1e332df79a4ad0bc40de (diff) | |
| download | gitpython-636f77bf8d58a482df0bde8c0a6a8828950a0788.tar.gz | |
fix conflict
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 8a171b4f..1bed8368 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,10 @@ # UNUSED, only for reference. If adjustments are needed, please see github actions language: python python: +<<<<<<< HEAD - "3.4" +======= +>>>>>>> b0f79c58ad919e90261d1e332df79a4ad0bc40de - "3.6" - "3.7" - "3.8" |