From 1241eeb3c4ba9bd9be5fbff581a11838e4972cb3 Mon Sep 17 00:00:00 2001 From: Nadine von Frankenberg Date: Tue, 11 Nov 2025 10:51:53 -0500 Subject: [PATCH 1/2] Add base code for Zhuoyan --- CommitCafe.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CommitCafe.java b/CommitCafe.java index 996cc36..ed12c2a 100644 --- a/CommitCafe.java +++ b/CommitCafe.java @@ -8,3 +8,5 @@ public static void main(String[] args) { System.out.println(barista + " brewed " + cups + " cups today."); } } + +// Branch for Zhuoyan From 5fcbff7b7e4bf844fccfbf5c1d2a58689a050e16 Mon Sep 17 00:00:00 2001 From: qhynSamuel Date: Tue, 11 Nov 2025 12:03:31 -0500 Subject: [PATCH 2/2] A small change --- CommitCafe.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CommitCafe.java b/CommitCafe.java index ed12c2a..9ae415f 100644 --- a/CommitCafe.java +++ b/CommitCafe.java @@ -5,7 +5,7 @@ public static void main(String[] args) { // TODO: Simulate a merge conflict by editing this file. // Replace the println() below with your own message or pun. - System.out.println(barista + " brewed " + cups + " cups today."); + System.out.println(barista + " brewed " + cups + " cups today_zhc."); } }