Code

Fix conflict main-develop#2514

Code

Merged

brosaplanella merged 16 commits intodeveloppybamm-team/PyBaMM:developfrom fix-conflict-main-developpybamm-team/PyBaMM:fix-conflict-main-developCopy head branch name to clipboardDec 2, 2022

+2-2

Commits

Commits on Aug 5, 2022

• Merge pull request #2197 from pybamm-team/develop

  Show description for 5f4913d
  brosaplanella

  authored
  5f4913d

Commits on Aug 30, 2022

• Merge pull request #2268 from pybamm-team/develop

  Show description for d0f27d3
  brosaplanella

  authored
  d0f27d3

Commits on Sep 29, 2022

• Merge pull request #2325 from pybamm-team/develop

  Show description for 8197ebf
  brosaplanella

  authored
  8197ebf

Commits on Oct 31, 2022

• Merge pull request #2412 from pybamm-team/develop

  Show description for 823aab0
  brosaplanella

  authored
  823aab0

Commits on Nov 13, 2022

• cmd-shift-f pass

  aabills

  committed
  0ae244c

• symbol replacer

  aabills

  committed
  80e0e2c

• remove have julia

  aabills

  committed
  b5bebdc

• eliminate julia import

  aabills

  committed
  960d00a

• coverage

  aabills

  committed
  d532df3

• Update CHANGELOG.md

  aabills

  authored
  0611f20

• Update CHANGELOG.md

  aabills

  authored
  641a458

• style: pre-commit fixes

  pre-commit-ci[bot]

  committed
  d9d4521

• Update version.py

  aabills

  authored
  f4b9cf1

Commits on Nov 14, 2022

• Merge pull request #2454 from abillscmu/main

  Show description for c544b6d
  valentinsulzer

  authored
  c544b6d

Commits on Dec 2, 2022

• Merge branch 'main' into fix-conflict-main-develop

  brosaplanella

  committed
  dcdfe19

• fixed version.py

  brosaplanella

  committed
  cbef368