fixed error in flake.nix caused by git

NixOS · Oct 10, 2023 · b30318e · b30318e
1 parent f09498a
commit b30318e
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/flake.nix b/flake.nix
@@ -169,15 +169,8 @@
       hardkernel-odroid-hc4 = import ./hardkernel/odroid-hc4;
       hardkernel-odroid-h3 = import ./hardkernel/odroid-h3;
       omen-15-en0010ca = import ./omen/15-en0010ca;
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
       omen-16-n0005ne = import ./omen/16-n0005ne;
->>>>>>> 0273b22cc210bc31ea2a40a9be560df688622f6b
       omen-15-en1007sa = import ./omen/15-en1007sa;
-=======
-      omen-16-n0005ne = import ./omen/16-n0005ne;
->>>>>>> 5883f1c (added omen 16-n0005ne profile)
       omen-en00015p = import ./omen/en00015p;
       onenetbook-4 = import ./onenetbook/4;
       olimex-teres_i = import ./olimex/teres_i;