From 60ad14e3bf19964299fa1b46cd665a88ea109971 Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <the@jeffreyfreeman.me>
Date: Fri, 5 Jan 2024 07:59:13 -0500
Subject: [PATCH] Oops left out some semicolons
---
pkgs/dev/git/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/dev/git/default.nix b/pkgs/dev/git/default.nix
index 3c8b8d7..928b393 100644
--- a/pkgs/dev/git/default.nix
+++ b/pkgs/dev/git/default.nix
@@ -44,7 +44,7 @@
# For supercede
core.symlinks = true;
safe.directory = "/etc/nixos";
- merge.conflictstyle = "diff3"
+ merge.conflictstyle = "diff3";
};
};
@@ -93,7 +93,7 @@
# For supercede
core.symlinks = true;
safe.directory = "/etc/nixos";
- merge.conflictstyle = "diff3"
+ merge.conflictstyle = "diff3";
};
};
--
GitLab