From 9bf0c3ade5a574ae59b28bc4fb2f66d2a752aa76 Mon Sep 17 00:00:00 2001
From: Nathan Woodburn <github@nathan.woodburn.au>
Date: Tue, 21 Mar 2023 13:44:58 +1100
Subject: [PATCH] Merge with both A and B

---
 src/gittest/Main.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gittest/Main.java b/src/gittest/Main.java
index 08e940d..2fb812f 100644
--- a/src/gittest/Main.java
+++ b/src/gittest/Main.java
@@ -2,6 +2,7 @@ package gittest;
 
 public class Main {
     public static void main(String[] args) {
+        A a = new A();
         B b = new B();
     }
 }