m3tam3re/m3ta-home
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: resolve flake lock conflict markers

Browse Source
This commit is contained in:
m3ta-chiron
2026-06-15 07:22:07 +02:00
parent 9be26d79cc
commit 4b4221da30
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.lock
Generated
-16
View File
@@ -296,27 +296,11 @@
"openspec": "openspec" "openspec": "openspec"
}, },
"locked": { "locked": {
<<<<<<< HEAD
"lastModified": 1781500279, "lastModified": 1781500279,
"narHash": "sha256-810qVHwu6jVhu01FWj9dXuruK84Gw2smAlbu6FPBfeY=", "narHash": "sha256-810qVHwu6jVhu01FWj9dXuruK84Gw2smAlbu6FPBfeY=",
||||||| cd80ded
"lastModified": 1779944037,
"narHash": "sha256-jO6zAJjgc9n3SeDJW1EbV6CEqOa9DK+2AhTgWc+ImHQ=",
=======
"lastModified": 1781153970,
"narHash": "sha256-OtC89zreW6Api7wpF5u76Jvkn8uQJiM+0yFFn/r+rj8=",
>>>>>>> d1494476b864173592c6dc4a1f0645189cdca192
"ref": "refs/heads/master", "ref": "refs/heads/master",
<<<<<<< HEAD
"rev": "050c273c65b36dc03c34a7547d80e88afff5ac48", "rev": "050c273c65b36dc03c34a7547d80e88afff5ac48",
"revCount": 327, "revCount": 327,
||||||| cd80ded
"rev": "ae1fb97c21b311dc03a46e8d50867048e5568c88",
"revCount": 323,
=======
"rev": "8fae0726a53ecabb04f4a0931a17a25de6a05fbf",
"revCount": 324,
>>>>>>> d1494476b864173592c6dc4a1f0645189cdca192
"type": "git", "type": "git",
"url": "ssh://gitea@code.m3ta.dev/m3tam3re/nixpkgs" "url": "ssh://gitea@code.m3ta.dev/m3tam3re/nixpkgs"
}, },