Skip to content

Commit

Permalink
Conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
castelletto1 committed May 16, 2024
2 parents 2d9360e + e388b70 commit 986c251
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/docs/JOSS/paper.bib
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ @Misc{ petsc-web-page

@Manual{trilinos-website,
title = {The {T}rilinos {P}roject {W}ebsite},
author = {The {T}rilinos {P}roject {T}eam}},
author = {The {T}rilinos {P}roject {T}eam},
year = {2020 (acccessed May 22, 2020)},
url = {https://trilinos.github.io}
}
Expand Down Expand Up @@ -107,4 +107,4 @@ @book{ IPCC_2023
publisher={Cambridge University Press},
year={2023},
doi = {10.1017/9781009157926}
}
}

0 comments on commit 986c251

Please sign in to comment.