From f9e2e1c1249f0cd61441f1e649ff7e2eb2892873 Mon Sep 17 00:00:00 2001
From: David Anorue <godbeingx@gmail.com>
Date: Tue, 28 Apr 2026 21:07:47 +0100
Subject: [PATCH] feature2

---
 file.txt | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/file.txt b/file.txt
index a987fee..02a116f 100644
--- a/file.txt
+++ b/file.txt
@@ -1,5 +1,3 @@
-This is my git work and i have absolutely no idea what im doing
-but i think i am getting this whole commit and branching stuff little by little
-<<<<<<< HEAD
-but do i really understand or what
+feature 2
+