forgotten resolves

2021-02-16 13:09:50 +01:00
parent b6439e7df3
commit a09024c6a2
2 changed files with 0 additions and 8 deletions
--- a/cube/User/Src/config.c
+++ b/cube/User/Src/config.c
@ -10,10 +10,7 @@
 t_configBlock defaultConfigBlock = {
    .configMagic = CONFIG_MAGIC,
    .deviceName = "MainsCnt",
-<<<<<<< HEAD
-=======
    .networkspecific.lan.macAddress = { 0x00, 0xA0, 0x57, 0x05, 0x3E, 0x0F },
->>>>>>> network_abstraction_layer
    .ntpServer = "0.de.pool.ntp.org",
    .deviceId = "MainsCnt01",
    .sharedSecret = "sharedSecretGanzGeheim",