Resolve conflicts

Saransh-cpp · Saransh-cpp · commit 5200e3ba8cdf · 2024-01-30T00:09:38.000+01:00
diff --git a/pybamm/__init__.py b/pybamm/__init__.py
@@ -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
 #

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,6 @@`
`54`	`54`	`from .logger import logger, set_logging_level, get_new_logger`
`55`	`55`	`from .settings import settings`
`56`	`56`	`from .citations import Citations, citations, print_citations`
`57`		`-`
`58`	`57`	`#`
`59`	`58`	`# Classes for the Expression Tree`
`60`	`59`	`#`