removed leftover merge marker

This commit is contained in:
Dennis Frieberg 2023-09-30 17:31:19 +02:00
parent d0d7237fa6
commit 4ccc9c83e6
Signed by untrusted user: nerf
GPG key ID: 42DED0E2D8F04FB6

View file

@ -52,5 +52,4 @@ services = {
};
};
};
>>>>>>> 2b0eec7 (added actual hardware identifiers & atual network config)
}