diff options
| author | Darren Tucker <dtucker@dtucker.net> | 2022-11-07 15:10:59 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2022-11-07 15:10:59 +1100 |
| commit | f58acaf8c7315483f4ac87d46a1aa2142a713cd8 (patch) | |
| tree | 46c92375221e2abdf4bcbe66be404a0b4c50806b /.github | |
| parent | 162e5741020a8d996c0c12b988b118e71ed728e6 (diff) | |
| download | openssh-git-f58acaf8c7315483f4ac87d46a1aa2142a713cd8.tar.gz | |
Fix merge conflict.
Diffstat (limited to '.github')
| -rw-r--r-- | .github/ci-status.md | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/.github/ci-status.md b/.github/ci-status.md index 8906cc0a..d13bbfa8 100644 --- a/.github/ci-status.md +++ b/.github/ci-status.md @@ -1,14 +1,8 @@ master : -<<<<<<< HEAD -[](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml) -[](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml) -[](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/upstream.yml) -[](https://github.com/openssh/openssh-portable/actions/workflows/cifuzz.yml) -======= [](https://github.com/openssh/openssh-portable/actions/workflows/c-cpp.yml?query=branch:master) [](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/selfhosted.yml?query=branch:master) [](https://github.com/openssh/openssh-portable-selfhosted/actions/workflows/upstream.yml?query=branch:master) ->>>>>>> 7bc8b8e5 (Have status badge links for master link to it.) +[](https://github.com/openssh/openssh-portable/actions/workflows/cifuzz.yml) [](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:openssh) 9.1 : |