Resolved Merge Conflicts

doudar · Dec 5, 2023 · 604f28c · 604f28c
1 parent 147a69a
commit 604f28c
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,11 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Updated kit purchasing links. 
 - MIN_ERG_CADENCE created and changed from 20 to 30.
 - Fixed DNS server in AP mode.
-<<<<<<< Updated upstream
-=======
-- Switched from using Power Table to a Torque Table for better compensation in cad variations. 
 - Fixed an issue with IC4 and variants not displaying device name in Bluetooth scanner. Fixes #500
->>>>>>> Stashed changes
 
 ### Hardware
 - Wire diameter reduced from 7.2mm to 6.0mm on the window passthrough to accommodate the latest batch of cables. 

diff --git a/src/BLE_Client.cpp b/src/BLE_Client.cpp
@@ -539,10 +539,7 @@ void SpinBLEClient::resetDevices(NimBLEClient *pClient) {
   }
 }
 
-<<<<<<< Updated upstream
-=======
 // Control a connected FTMS trainer. If no args are passed, treat it like an external stepper motor.
->>>>>>> Stashed changes
 void SpinBLEClient::FTMSControlPointWrite(const uint8_t *pData, int length) {
   NimBLEClient *pClient = nullptr;
   for (int i = 0; i < NUM_BLE_DEVICES; i++) {