From 9bd51f9318860924faac8355f9b7f2f1350aef35 Mon Sep 17 00:00:00 2001
From: Christoph Hollizeck <christoph.hollizeck@hey.com>
Date: Fri, 8 Nov 2024 00:53:41 +0100
Subject: [PATCH] rebase: so much to learn

---
 flake.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/flake.nix b/flake.nix
index c7d70a3..3f0ed80 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,11 +7,7 @@
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
 
     nixpkgs-master.url = "github:nixos/nixpkgs/master";
-<<<<<<< HEAD
     nixpkgs-latest-factorio.url = "github:Daholli/nixpkgs/d941e9aa2d89f377d45516c5edd765fef15ea90a";
-=======
-    nixpkgs-latest-factorio.url = "github:Daholli/nixpkgs/19493dc0ad16ffd5414ac9b4e12179d0e1b98468";
->>>>>>> d1ad881e (misc forgot to commit)
 
     home-manager = {
       url = "github:nix-community/home-manager/master";