Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolve version conflicts #195

Merged
merged 14 commits into from
Oct 10, 2021
Merged

Resolve version conflicts #195

merged 14 commits into from
Oct 10, 2021

Commits on Oct 10, 2021

  1. Rename yolotr to yolov5t

    @zhiqwang
    zhiqwang committed Oct 10, 2021
    Configuration menu
    Copy the full SHA
    2eb8e4a View commit details
    Browse the repository at this point in the history

  2. Remove redundant code and resolve version conflicts

    @zhiqwang
    zhiqwang committed Oct 10, 2021
    Configuration menu
    Copy the full SHA
    95e4551 View commit details
    Browse the repository at this point in the history

  3. Rename yolov5t to yolov5ts

    @zhiqwang
    zhiqwang committed Oct 10, 2021
    Configuration menu
    Copy the full SHA
    8dcda43 View commit details
    Browse the repository at this point in the history

  4. Resolve version conflicts

    @zhiqwang
    zhiqwang committed Oct 10, 2021
    Configuration menu
    Copy the full SHA
    c8245f6 View commit details
    Browse the repository at this point in the history

  5. Fixing docstrings

    @zhiqwang
    zhiqwang committed Oct 10, 2021
    Configuration menu
    Copy the full SHA
    ad02088 View commit details
    Browse the repository at this point in the history

  6. Resolve version conflicts

    @zhiqwang
    zhiqwang committed Oct 10, 2021
    Configuration menu
    Copy the full SHA
    df7c5b2 View commit details
    Browse the repository at this point in the history

  7. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Oct 10, 2021
    Configuration menu
    Copy the full SHA
    3bee37c View commit details
    Browse the repository at this point in the history

  8. Fixing TypeError in darknet_tan_backbone

    @zhiqwang
    zhiqwang committed Oct 10, 2021
    Configuration menu
    Copy the full SHA
    f5e94c8 View commit details
    Browse the repository at this point in the history

  9. Fixing docstrings

    @zhiqwang
    zhiqwang committed Oct 10, 2021
    Configuration menu
    Copy the full SHA
    43de989 View commit details
    Browse the repository at this point in the history

  10. [pre-commit.ci] auto fixes from pre-commit.com hooks 

    for more information, see https://pre-commit.ci
    @pre-commit-ci
    pre-commit-ci[bot] committed Oct 10, 2021
    Configuration menu
    Copy the full SHA
    5735f26 View commit details
    Browse the repository at this point in the history

  11. Fixing test_load_from_yolov5

    @zhiqwang
    zhiqwang committed Oct 10, 2021
    Configuration menu
    Copy the full SHA
    f0ec981 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'resolver-version-conflicts' of github.com:zhiqwang/yolo… 

    …v5-rt-stack into resolver-version-conflicts
    @zhiqwang
    zhiqwang committed Oct 10, 2021
    Configuration menu
    Copy the full SHA
    6c21a1c View commit details
    Browse the repository at this point in the history

  13. Fixing test_load_from_yolov5

    @zhiqwang
    zhiqwang committed Oct 10, 2021
    Configuration menu
    Copy the full SHA
    5750b3c View commit details
    Browse the repository at this point in the history

  14. Rename to up_version

    @zhiqwang
    zhiqwang committed Oct 10, 2021
    Configuration menu
    Copy the full SHA
    b05a07a View commit details
    Browse the repository at this point in the history