fix: remove merge conflict markers from zeo_code_mappings.py

Author: NOisi-X

roborock/data/zeo/zeo_code_mappings.py

@@ -5,8 +5,6 @@
 
 For enums that map between protocol-level positions and physical units
 (e.g. spin speed, temperature), the comment format is
-``# L<N>, <physical-value>`` where ``L<N>`` is the protocol position
-and ``<physical-value>`` is the user-facing display value
 (RPM, degrees Celsius, minutes, etc.).
 
 Enums commented out at the bottom of this file are App-internal lookup
@@ -318,8 +316,6 @@ class ZeoDryerStartError(RoborockEnum):
 # class SmartHostStatus(RoborockEnum):
 #     smart_host_waiting = 0
 #     smart_hosting = 1
-<<<<<<< HEAD
-=======
 
 
 
@@ -329,4 +325,3 @@ class ZeoDryerStartError(RoborockEnum):
 
 
 
->>>>>>> 6bfc4a7b7093d425e6e11fd70c7085d233fbe3c1