D'oh

2016-11-08 12:27:01 +00:00 · 2016-11-08 12:27:01 +00:00 · 4b003d4a01
commit 4b003d4a01
parent e9420b8a38
1 changed files with 0 additions and 7 deletions
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@ -517,14 +517,7 @@
      gocd-server = 252;
      terraria = 253;
      mattermost = 254;
-<<<<<<< HEAD
-=======
-      prometheus = 255;
-      #telegraf = 256; # unused
-      gitlab-runner = 257;
-      postgrey = 258;
      hound = 259;
->>>>>>> 6c7a605... hound: init module

      # When adding a gid, make sure it doesn't match an existing
      # uid. Users and groups with the same name should have equal