Update ankaa config

flake.lock

@@ -64,11 +64,19 @@
         ]
       },
       "locked": {
+<<<<<<< HEAD
         "lastModified": 1725781935,
         "narHash": "sha256-o6LRtdpgBTzev9n243Ktu3rn0/qsv0frFyJwU6vJsdE=",
         "owner": "nix-community",
         "repo": "home-manager",
         "rev": "ec4c6928bbacc89cf10e9c959a7a47cbaad95344",
+=======
+        "lastModified": 1724435763,
+        "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
+>>>>>>> 9043a8b (Update ankaa config)
         "type": "github"
       },
       "original": {
@@ -83,11 +91,19 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
+<<<<<<< HEAD
         "lastModified": 1725811735,
         "narHash": "sha256-ekBC3PfiyQ5K9InH/PbSUXJaTr/yp2L8EquNCStN7D8=",
         "owner": "ggerganov",
         "repo": "llama.cpp",
         "rev": "3f7ccfd649abc83d059b5462221ac14de4ede6b7",
+=======
+        "lastModified": 1724858880,
+        "narHash": "sha256-gXLnMy8oAW2IxpmkrB2cp2BnC2hz5Pbsjvwo3cqXVWs=",
+        "owner": "ggerganov",
+        "repo": "llama.cpp",
+        "rev": "9fe94ccac92693d4ae1bc283ff0574e8b3f4e765",
+>>>>>>> 9043a8b (Update ankaa config)
         "type": "github"
       },
       "original": {
@@ -98,11 +114,19 @@
     },
     "nixpkgs": {
       "locked": {
+<<<<<<< HEAD
         "lastModified": 1724819573,
         "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
         "owner": "NixOS",
         "repo": "nixpkgs",
         "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
+=======
+        "lastModified": 1723637854,
+        "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
+>>>>>>> 9043a8b (Update ankaa config)
         "type": "github"
       },
       "original": {
@@ -126,11 +150,19 @@
     },
     "nixpkgs-stable": {
       "locked": {
+<<<<<<< HEAD
         "lastModified": 1725693463,
         "narHash": "sha256-ZPzhebbWBOr0zRWW10FfqfbJlan3G96/h3uqhiFqmwg=",
         "owner": "nixos",
         "repo": "nixpkgs",
         "rev": "68e7dce0a6532e876980764167ad158174402c6f",
+=======
+        "lastModified": 1724727824,
+        "narHash": "sha256-0XH9MJk54imJm+RHOLTUJ7e+ponLW00tw5ke4MTVa1Y=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "36bae45077667aff5720e5b3f1a5458f51cf0776",
+>>>>>>> 9043a8b (Update ankaa config)
         "type": "github"
       },
       "original": {
@@ -158,11 +190,19 @@
     },
     "nixpkgs-unstable": {
       "locked": {
+<<<<<<< HEAD
         "lastModified": 1725634671,
         "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
         "owner": "nixos",
         "repo": "nixpkgs",
         "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c",
+=======
+        "lastModified": 1724479785,
+        "narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be",
+>>>>>>> 9043a8b (Update ankaa config)
         "type": "github"
       },
       "original": {
@@ -205,11 +245,19 @@
         "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
+<<<<<<< HEAD
         "lastModified": 1725765163,
         "narHash": "sha256-rfd2c47iVSFI6bRYy5l8wRijRBaYDeU7dM8XCDUGqlA=",
         "owner": "Mic92",
         "repo": "sops-nix",
         "rev": "b68757cd2c3fa66d6ccaa0d046ce42a9324e0070",
+=======
+        "lastModified": 1723501126,
+        "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=",
+        "owner": "Mic92",
+        "repo": "sops-nix",
+        "rev": "be0eec2d27563590194a9206f551a6f73d52fa34",
+>>>>>>> 9043a8b (Update ankaa config)
         "type": "github"
       },
       "original": {