Skip to content

Commit

Permalink
2024-07-19 update : fixing fatal merge.
Browse files Browse the repository at this point in the history
Merge branch 'master' of github.com:cbernalz/UCIWWEIHR.jl

# Conflicts:
#	Project.toml
  • Loading branch information
cbernalz committed Jul 20, 2024
2 parents c77eb88 + 471d397 commit aa6a165
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ jobs:
- x64
steps:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v1
- uses: julia-actions/setup-julia@v2
with:
version: ${{ matrix.version }}
arch: ${{ matrix.arch }}
- uses: julia-actions/cache@v1
- uses: julia-actions/cache@v2
- uses: julia-actions/julia-buildpkg@v1
- uses: julia-actions/julia-runtest@v1
- uses: julia-actions/julia-processcoverage@v1
- uses: codecov/codecov-action@v3
- uses: codecov/codecov-action@v4
with:
files: lcov.info
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ authors = ["Christian O. Bernal Zelaya"]
version = "1.0.0-DEV"

[deps]
Documenter = "e30172f5-3e0c-5b2b-83c7-4185c0c0d5a4"
Documenter = "*"

[compat]
julia = "1"
Expand Down

0 comments on commit aa6a165

Please sign in to comment.