Tidy up merge conflicts

bjpirt · Dec 3, 2023 · 70e3b88 · 70e3b88
1 parent 779ac42
commit 70e3b88
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/battery/battery_cell.py b/battery/battery_cell.py
@@ -1,9 +1,6 @@
 from __future__ import annotations
 
-<<<<<<< HEAD
-=======
 from hal import get_interval
->>>>>>> 763c272 (Add hysteresis on detecting over voltage errors)
 from .constants import OVER_VOLTAGE, UNDER_VOLTAGE
 from typing import TYPE_CHECKING, List
 if TYPE_CHECKING:

diff --git a/test/bms/test_Bms.py b/test/bms/test_Bms.py
@@ -1,6 +1,6 @@
 import unittest
 from battery.battery_pack import BatteryPack  # type: ignore
-from bms import Config
+from config import Config
 from bms.bms import Bms
 from bms.current_sensor.current_sensor import CurrentSensor