From bfb45399dd078847a380c40bcaccd03257943996 Mon Sep 17 00:00:00 2001
From: Bob <hbmmods@gmail.com>
Date: Mon, 6 Nov 2023 18:52:24 +0100
Subject: [PATCH] Auto stash before merge of "master" and "origin/master"

---
 changelog | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/changelog b/changelog
index 818c3edaa..a8ce84de8 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,4 @@
+<<<<<<< Updated upstream
 ## Changed
 * The wood-burning generator now burns 40mB/s instead of 1mB/s
 * Buffed the wood-burning generator's efficiency for fluids from 25% to 50%
@@ -5,4 +6,6 @@
 
 ## Fixed
 * Fixed wood-burning generator being 100x more efficient than it's supposed to be
-* Fixed arc welders eating infinite energy
\ No newline at end of file
+* Fixed arc welders eating infinite energy
+=======
+>>>>>>> Stashed changes