Commit e5ed15da52fd

Vincent Demeester <vincent@sbr.pm>
2026-01-08 15:20:33
Remove conflicts markers
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
main
1 parent b91e0c9
Changed files (1)
systems
aomi
extra.nix
systems/aomi/extra.nix
@@ -218,15 +218,6 @@
     ];
   };
 
-<<<<<<< Updated upstream
-  # Directory structure for systemd services
-  systemd.tmpfiles.rules = [
-    "d /var/lib/ollama-exporter 0755 root root -"
-    "d /var/lib/git-builds 0755 builder users -"
-  ];
-
-=======
->>>>>>> Stashed changes
   # Build execution script
   environment.etc."git-builds/execute-build.sh" = {
     text = ''