merge fix

src/components.siemens.identification/app/apax.yml

@@ -27,10 +27,7 @@ devDependencies:
   "@ix-ax/ax-sdk": '0.0.0-dev.0'
   "@ax/hwc": ^0.12.217
   "@ax/hwld": ^0.8.23
-<<<<<<< HEAD
   "@ax/dcp-utility": ^1.1.1
-=======
->>>>>>> ab40b399003037d3c0dfc805f1b456a4790a6437
 dependencies:
   "@ix-ax/axopen.core": '0.0.0-dev.0'
   "@ix-ax/axopen.timers": '0.0.0-dev.0'
@@ -124,10 +121,6 @@ scripts:
   dcpli: apax dcp-utility list-interfaces -f JSON # list all interfaces, used to discover MAC address of the adapter connected to PLC and set the PC_MAC value accordingly
 
   dcpd: apax dcp-utility discover --source-mac $PC_MAC --timeout 10000 # discover all accesible devices connected to adapter with MAC address equal to PC_MAC, used to discover MAC-addresses of the slaves and setting the PLC_MAC,RF186_MAC and ET201_MAC variables
-<<<<<<< HEAD
-=======
-  ET201_NAME: "et200sp"
->>>>>>> ab40b399003037d3c0dfc805f1b456a4790a6437
 
   reset_plc: apax hwld -t $PLC_IP --resetPlc All --accept-security-disclaimer #total reset of the PLC including IP and name