resolve conflicts

viamrobotics · Sep 10, 2023 · cedbfde · cedbfde
1 parent 266e92f
commit cedbfde
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/docs/components/power-sensor/ina219.md b/docs/components/power-sensor/ina219.md
@@ -53,4 +53,4 @@ The following attributes are available for `INA219` sensors:
 | `i2c_bus` | integer | **Required** | The `name` of the [I<sup>2</sup>C bus](/components/board/#i2cs) that the sensor is connected to. |
 | `i2c_address` | integer | Optional | The sensor's unique [I<sup>2</sup>C address](https://learn.adafruit.com/i2c-addresses/overview). <br>Default: `0x40`
 | `max_current_amps` | number | Optional | The maximum current that the sensor can measure in amperes (A).
-| `shunt_resistance` | number | Optional | The shunt resistance value of the sensor in Ohms (Ω).
+| `shunt_resistance` | number | Optional | The shunt resistance value of the sensor in Ohms (Ω).
diff --git a/docs/components/power-sensor/ina226.md b/docs/components/power-sensor/ina226.md
@@ -50,4 +50,4 @@ The following attributes are available for `INA226` sensors:
 | `i2c_bus` | integer | **Required** | The `name` of the [I<sup>2</sup>C bus](/components/board/#i2cs) that the sensor is connected to. |
 | `i2c_address` | integer | Optional | Default: `0x40`. The sensor's unique [I<sup>2</sup>C address](https://learn.adafruit.com/i2c-addresses/overview). |
 | `max_current_amps` | number | Optional | The maximum current that the sensor can measure in amperes (A).
-| `shunt_resistance` | number | Optional | The shunt resistance value of the sensor in Ohms (Ω).
+| `shunt_resistance` | number | Optional | The shunt resistance value of the sensor in Ohms (Ω).