forked from Fachschaft/nixConfig
removed leftover merge marker
This commit is contained in:
parent
d0d7237fa6
commit
4ccc9c83e6
1 changed files with 0 additions and 1 deletions
|
@ -52,5 +52,4 @@ services = {
|
|||
};
|
||||
};
|
||||
};
|
||||
>>>>>>> 2b0eec7 (added actual hardware identifiers & atual network config)
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue