From 71f077445f93f17856963f73ce2f58b162e3e7f1 Mon Sep 17 00:00:00 2001
From: Nadine von Frankenberg <vonfrankenberg@pitt.edu>
Date: Tue, 11 Nov 2025 10:51:40 -0500
Subject: [PATCH 1/3] Add base code for Richard

---
 CommitCafe.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CommitCafe.java b/CommitCafe.java
index 996cc36..a634dd3 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 Richard

From 001e76798b644a6c0f67dc617f81bf087a9e5988 Mon Sep 17 00:00:00 2001
From: richardjorne <154006102+richardjorne@users.noreply.github.com>
Date: Tue, 11 Nov 2025 11:52:12 -0500
Subject: [PATCH 2/3] more cafe created

---
 CommitCafe.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CommitCafe.java b/CommitCafe.java
index a634dd3..abf5a64 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 + " ??????????? OMG SOMANYCUPS TODAY!!!!!!!");
     }
 }
 

From d16254f0dcf0cd3b8f864e0c49580f1432246958 Mon Sep 17 00:00:00 2001
From: richardjorne <154006102+richardjorne@users.noreply.github.com>
Date: Tue, 11 Nov 2025 12:20:28 -0500
Subject: [PATCH 3/3] more cafe created

---
 .DS_Store | Bin 0 -> 8196 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..a34f8849737c84c0248dd58c43d2578bee409fc1
GIT binary patch
literal 8196
zcmeHMU2GLa6rOKeWY=D03ls|IW$8ubr^U8VD4=rbEk<Zdu`TqEQucP2vasDPclX{F
zn`)yG@i#tb{7Z~6#^2}*0bj%*{yr);M8ktI#0QP|!i&71XLj~B(AwyWMsz3HIdjgO
zGqdOHcV_O)WsIRNYg92-${3UB;Z!Z6>JJL<=g*WPg_1&|AbXY`@&?nkn<oCm6zxb5
zMIeem6oDuLQ3Rq0{2L-bdp0lfH2c2jjp`@@Q3U>%5#Z~CMh~aSkd6r&EFDw@M*yPy
z2oMx%tGq!}3u!W>V}eo-6$n$J!W7{V1Hzo-TBw%{>6oCxoFP1XAe<TD2?fFIG`<$7
zGb9C#>L>zH1g1uSr%xeU#rm1W{43Az=|S7_{L0F+kO~TCTsM<S(afIK{q9h!ulrfA
zPS136uFZArbiS>pcUk68uR1s7I=*f>W+pJO43kuLw_A?k4%N9?$M6E%R?(qQ=~d^A
zj8v^D*D6QLwUMgI+STRS+S>J_ql#RTxP4<w??HROagPcI5H14jhDi=RdZjnEmrIG;
zh=O$9n{%NzvT}V<EOukOqqD1fcTZQZs%Aa2#k6(b%9-`LZ+gAzERWpV+UGhuGG>n4
zYVULH?0`c(#eKTnmnCI$vu(Fp_i^pnT%~!?w_L~DWoA60e2Bh`Yuh_q&*B}O9lkm2
zbAu^e9bKNA@l(MJ9TrW>wYv1-w$MOP-kVjb-Libu>e@Ru-@R>n%eY!Rdrqt*HorY*
zc~;sscMe&GzrR!W`b@{Loc=BfuH#$#EHk4Nqg-io^Z|2x&Vq%DZn`-hpRAo9r6ZfR
z4rML>u$qu%F-KW^siGd2cN^qylWXu1ji4u97GEaI-CUl^m{bdKY-PMcQFXb^BNxOF
zm9c6?^^~@QgaBb$6I&;%hO*Pv)21y%8)A3JYJ<|A6VVgGl2}q!I{Ms!0dmF@vQ&JF
ztbQTy;S)FNp5HuZI{8;h#kb0Gm$zTfn9W0kzr010EC*kd<lJP7Vfk(*h(>c+Jl@HN
z+H4r6K~67Puy9ViExt=u&ybC3IXR0EPoGZ!U!FS&bV%d{iR22=Oq@FKO3(^|o=8@P
z8ZukVs#!g2WP4ebJ;I)5ud;XPuIwXrntja9uygD@`;lE_m)UQSPyiXln2#k`j%uty
z4c1~4lBh!pJJ5+PbfX`GI0O$q4&y;QgokkikK-9Ui|6n>Ud9`E6K~@k9K#1Vi4XBP
zzQkAf8sj*RpK$@d;F2Us1yZ3jPg*Q3msUtCr8QEGv`(s(8l*<4N7^U3(y%ltJdpC4
zw<q){B+?OTOspf6dEq^vbaI-^)9%^2t)a1L+qIB+-_GK>Hn(Kn{L&@2uB@zCe^=cE
zA_ai+n7uL=0{CB*Gy(hrL`;URNXnSDlk&qHo-Q}lnLLl>ajspKh-vB!${@kswv5>8
zD0>83UZH8KL`f^ys%kB!7Enqmf$iD~Vi7VMHpXIVAtk5i+Y~33g-oiRhT*9u|9zl8
z%f4ejunX)GyNn{JD8W)xU^Uhg$Q#f^K))9)1oR&CVlQ+YfDH#O!TvBtFpB%}0FL4@
zJb@?i6oLK)yoi_Z8eS*hzeUhLhT}Ma_i+lR@d-Y~XOsfp;CuXpi}-aCsJBl7H3$0y
zsB^6u$9A25lI4@&YV~W5D-ds7%Fq8>roaEc=KP9YIEp|NfxjLB6xO%a*OC5o>l#06
zYxL};hZn9lCTL(n)m0Y(#83QTNNtT&xlJ;pV}g=|%0GS)F!@LMpa1fX_Wx-AXa0X|
G|NkAE6oE<r

literal 0
HcmV?d00001