Merge branch 'magrathea' of git.solarpunk.moe:geekygays/nixconf into magrathea

using our nixpkgs ?
2024-03-30 01:02:12 +00:00 · 2024-03-30 01:00:12 +00:00
1 changed files with 8 additions and 0 deletions
--- a/flake.lock
+++ b/flake.lock
@ -149,11 +149,19 @@
    },
    "nixpkgs": {
      "locked": {
+<<<<<<< HEAD
+        "lastModified": 1711738046,
+        "narHash": "sha256-J7/vq+qaf2gZPPKAH+dK9pZAwR6wxuOVNozRQoAstHQ=",
+        "owner": "geekygays",
+        "repo": "nixpkgs",
+        "rev": "9b978713e26536cbc555ac33c4a4b1733a7c3eae",
+=======
        "lastModified": 1711712949,
        "narHash": "sha256-8/qCHYhBTQx7rg65cXE8hOOCIvazEm+VnoFaSzZctMw=",
        "owner": "geekygays",
        "repo": "nixpkgs",
        "rev": "c81d1240f87279aacaad75b0ee73ef395325f855",
+>>>>>>> a50c0a316efe8a36ab5b01db9bcd0a388ec41b8b
        "type": "github"
      },
      "original": {
Author	SHA1	Message	Date
Bit Borealis	e10cc0e9dc	Merge branch 'magrathea' of git.solarpunk.moe:geekygays/nixconf into magrathea	2024-03-30 01:02:12 +00:00
Bit Borealis	c05217f296	using our nixpkgs ?	2024-03-30 01:00:12 +00:00