aynish/helm
1
0
Fork 0
Code Pull requests Packages Projects Releases Activity

fix: merge conflight in lockfile

Browse source
This commit is contained in:
Anish Lakhwara 2023-08-12 19:01:41 -07:00
parent a8f0e05f32
commit 7290bdad3b
1 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
flake.lock
View file

@ -487,19 +487,11 @@
] ]
}, },
"locked": { "locked": {
<<<<<<< HEAD
"lastModified": 1691215224, "lastModified": 1691215224,
"narHash": "sha256-sajUJsMFxIVUiDUxbRdukGy650lDLmUQG6FUOuzLs+A=", "narHash": "sha256-sajUJsMFxIVUiDUxbRdukGy650lDLmUQG6FUOuzLs+A=",
"ref": "main", "ref": "main",
"rev": "cb1c91802c74065cf9b8ecb35e14fb75d896bc39", "rev": "cb1c91802c74065cf9b8ecb35e14fb75d896bc39",
"revCount": 943, "revCount": 943,
=======
"lastModified": 1691809207,
"narHash": "sha256-Ml3w6o96E66OgEv5+z6OCtLLAQylvcOTX2t/D+jPSFs=",
"ref": "main",
"rev": "31089236697319f4be5c50e16add3154235c7c3c",
"revCount": 963,
>>>>>>> b42ede3a30e7ccb72da99ba39f1c81833775d576
"type": "git", "type": "git",
"url": "ssh://gitea@git.sealight.xyz/aynish/kitaab" "url": "ssh://gitea@git.sealight.xyz/aynish/kitaab"
}, },