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

fix conflict #18

Merged
merged 6 commits into from
Sep 7, 2023
Merged

fix conflict #18

merged 6 commits into from
Sep 7, 2023

Commits on Sep 6, 2023

  1. Merge pull request drieslab#13 from drieslab/dev 

    Updates to gh-actions and tests
    @jiajic
    jiajic authored Sep 6, 2023
    Configuration menu
    Copy the full SHA
    9e8ce17 View commit details
    Browse the repository at this point in the history

  2. Merge pull request drieslab#15 from drieslab/dev 

    Update workflows and PAT usage
    @jiajic
    jiajic authored Sep 6, 2023
    Configuration menu
    Copy the full SHA
    4ca961b View commit details
    Browse the repository at this point in the history

  3. try to add xml2 which codecov says is missing

    @jiajic
    jiajic committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    fa82659 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' of https://github.com/jiajic/GiottoClass

    @jiajic
    jiajic committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    051a384 View commit details
    Browse the repository at this point in the history

  5. Merge pull request drieslab#16 from jiajic/main 

    test prod workflow
    @jiajic
    jiajic authored Sep 6, 2023
    Configuration menu
    Copy the full SHA
    b8d4ab4 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2023

  1. fix conflict

    @jiajic
    jiajic committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    177cd01 View commit details
    Browse the repository at this point in the history