Skip to content

Commit

Permalink
Resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@Saransh-cpp
Saransh-cpp committed Jan 29, 2024
2 parents 7cdb5ef + 97ca773 commit 5200e3b
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion pybamm/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
from .logger import logger, set_logging_level, get_new_logger
from .settings import settings
from .citations import Citations, citations, print_citations

#
# Classes for the Expression Tree
#
Expand Down

0 comments on commit 5200e3b

Please sign in to comment.