Skip to content

Commit

Permalink
Merge branch 'pybamm-team:main' into tests
Browse files Browse the repository at this point in the history
  • Loading branch information
santacodes authored Jun 13, 2024
2 parents 2f51084 + 6ea83fd commit feaf031
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions CODE-OF-CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](code_of_conduct.md)
[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](CODE-OF-CONDUCT.md)


# Contributor Covenant Code of Conduct
# `pybamm-cookiecutter` Code of Conduct

## Our Pledge

Expand Down

0 comments on commit feaf031

Please sign in to comment.