From 5c01783fa1f82a4967ae5fddf541f2a463c75472 Mon Sep 17 00:00:00 2001 From: Jonathan Mieloo Date: Fri, 9 Jan 2026 00:58:15 +0100 Subject: [PATCH] 2 features --- diff.txt | 1 + feature-b.ts | 1 + test.txt | 1 + 3 files changed, 3 insertions(+) create mode 100644 diff.txt create mode 100644 feature-b.ts diff --git a/diff.txt b/diff.txt new file mode 100644 index 0000000..45b983b --- /dev/null +++ b/diff.txt @@ -0,0 +1 @@ +hi diff --git a/feature-b.ts b/feature-b.ts new file mode 100644 index 0000000..66a3eb9 --- /dev/null +++ b/feature-b.ts @@ -0,0 +1 @@ +feature B code diff --git a/test.txt b/test.txt index b348989..ed9edf5 100644 --- a/test.txt +++ b/test.txt @@ -6,3 +6,4 @@ wowie hi test conflicting change +another line