From c55e4690fb4959d78091cfc870a6bc655809f1ed Mon Sep 17 00:00:00 2001 From: Julie Kirsch Date: Sun, 26 May 2024 23:21:45 +0200 Subject: [PATCH] final? --- book/workflows/edit_book.md | 16 +++------------- .../figures/Merge_Conflict_GitHubDesktop.PNG | Bin 0 -> 28044 bytes .../figures/Merge_Conflict_GitHubDesktop2.PNG | Bin 0 -> 32713 bytes book/workflows/merge_request.md | 2 +- 4 files changed, 4 insertions(+), 14 deletions(-) create mode 100644 book/workflows/figures/Merge_Conflict_GitHubDesktop.PNG create mode 100644 book/workflows/figures/Merge_Conflict_GitHubDesktop2.PNG diff --git a/book/workflows/edit_book.md b/book/workflows/edit_book.md index 118501e..f79e0b4 100644 --- a/book/workflows/edit_book.md +++ b/book/workflows/edit_book.md @@ -445,7 +445,7 @@ By clicking on the 🔄 button, you will pull your colleages' changes. 2. When multiple people work on one chapter, it is possible that conflicts will arise if you and your colleagues have made incompatible changes in the same branch. In that case, when pulling from the remote repositery, Git in VS Code will recognize conflicts and help you to solve potential incompatible changes (merging conflicts). Open the files that are marked as conflicitng.
- Example Image + Example Image
The figure above shows the conflicts. If you look closely you can see that the last couple of words of the paragraph are different in the main branch than in the branch we were working in. There are a couple of options in the top bar: @@ -523,20 +523,10 @@ After committing, click the 🔄 button to push our changes to the remote reposi 2. When multiple people work on one chapter, it is possible that conflicts will arise if you and your colleagues have made incompatible changes in the same branch. In that case, when pulling from the remote repositery, GitHub Desktop will recognize conflicts and help you to solve potential incompatible changes (merging conflicts).
- Example Image + Example Image
-In this case there are two conflicted files. GitHub Desktop is suggesting to resolve the changes in VS Code. Click on `Open in Visual Studio Code`. - -
- Example Image -
- -The figure above shows the conflicts. If you look closely you can see that the last couple of words of the paragraph are different in the main branch than in the branch we were working in. There are a couple of options in the top bar: - -- `Accept Current Change` will keep the change in your branch -- `Accept Incoming Change` will keep the change from the main branch (the branch you are merging into your branch) -- `Accept Both Changes` will retain both paragraphs +In this case there are two conflicted files. GitHub Desktop is suggesting to resolve the changes in VS Code (in that case have a look at the section treating VS Code). By clicking on the small downwards arrow you can also solve the conlict directly in GitHub Dekstop by choosing the branch of the file you want to keep. Choose one of the options to resolve the merge conflict. You now have updated your work with work from your colleagues and resolved potential conlicts. You are now ready to continue working on the content. diff --git a/book/workflows/figures/Merge_Conflict_GitHubDesktop.PNG b/book/workflows/figures/Merge_Conflict_GitHubDesktop.PNG new file mode 100644 index 0000000000000000000000000000000000000000..57f55d6733f8a8de0a80205b710dac15a656c742 GIT binary patch literal 28044 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 literal 0 HcmV?d00001 diff --git a/book/workflows/figures/Merge_Conflict_GitHubDesktop2.PNG b/book/workflows/figures/Merge_Conflict_GitHubDesktop2.PNG new file mode 100644 index 0000000000000000000000000000000000000000..905b7e863154bedd8cafb0567d77549408a1293a GIT binary patch literal 32713 zcmeFYRZyJY_BM#ScYwx22x&Ax0t9ypgvKSoAtboF2k+nn3qgasy9WyrTtjeocj%s% z{LY+nW~Qd^st-Tn6Nz1Cj#JZo*3GE^2HhY|+~2?_tToRlgO5^4n!67pLt z6yTkXKGC1RKV(N$SqY@lA?j`51=>e(MR6pgiYVMWBXr<3ww>HtMRhXa9xp(g7GY?ECb$BRgpcLd-fIYNhp&P5!^>Z>3n-UFW`gB_{;g7MQ>r7LTKt~ zit?nIYobRFqWoKQ(pp=O_e*wmb`1tbMjn1fMt**NW`2Hl;m*nNS1(`gPCN@FlK9E> zD<#E^oW7S@)@jAY_3-R0TaMPy^zHzS{(XhA>+8+jg5`SA3srfXKsQeZ2MZ6G z#3ok@j~=sbLryTV$#iKuN%25M9FfEmP#H+j_U%&BZu7Et`||+e`Qycv*7)S)gji!? zT1{kjC^VQXFFV)Nslg*J_d~d57!?Tgg@z_|om3;olr*&Rq`z?I_eMf39R8`Gz&y(# zbf&^&^Q!B;RwC{%V!ip&EQ;&1!M&v=Woc9Ax}uMfok{Z*i zyt>-j)-qc|N;<1M7EW*&4Q1pLLG4R53oiOmztygxZFYDknq0xab6DMA@AW;M>n-E6@2+b*-3PUK_FoP)U&RiLy{y#H znd|L=gx_=+J2({P)OfFMTpgx)+?an%`I4N*&&_Q$@zpatJX~U^tzxAsZUS$HU;e{~ z53;hoAtADlkE^N#&-$_A-ar+z##uGXx>;-QciHUm@bFAOtfx5q{u(6B*vXL9qk>^F z+F7sgj$_J~=8TFpT2DeQ+las7l(%LvzmlHL@i@|DVXc0Df5xbH=<6&^{WAaZqZi;& za)ikMc4nL4==RRnq?8x$*lnDe=D*c-rF-0b#h&{TCNJ-Ja#G>B!N2Ky8u;b;J7;rq z_iJFsW%0iCe+~k(*KB=m1*v$g`+jj)*_hMNQgH1I3XjwlSDsKU3UD#9XVsMvnt-V( z`+xQ?R66UJI{#Wbt5)&-;NoIz!NS9E`kBY___K8!*g1jk<_7acm1B81x^%asY{etI z9^xO4uc{Bi)2MPx`y#1z-W7kVs4}$$Nj!=0wOh#eJ*Qzcb3M^yvN`PIb7`UkzYa>& z_dbq)1;)b&=rBaX{ljYC+vTk`IOG0-?UfdArZEw{uzi|4En(W8Z&$sd*L~@Tn?I~& zE!W2#k|Bh2a6x*&o%{nl84r@`ZC4Ipp7}z0m52F5sbq+%SKD2IQq;AeIi0IA5@WCS z7I-k#k^5z56oG)PlLQuh;2{1VVSB>v)QQvfq<3%RvQ7B8;0%XKbFdP?@KDq3nY$i* z^+&t#BUjZwO6xr=P`nA@=~i4ooFL!mSBwiOJM>%&?V`8WdS%TQxu>;%efzE>_0gr; zF8SeAeo}O3uY(SQ%g3JebQ;SB&UI7v|^-jhT zPlz^cE4B$?A3wM@AB|bw1OA=A#9iML){-L_NTzCcu1S}TjzuI-;ySePGYSmD_ z*%lZb+U~SMAp!&%;QQG2#`n7*hq)XOh{QY;ba=sc3~hGK`|x4wuOdbRZkZ1XFM#ze zT@vtDF{~DSA2f`U0Gcy+R=bdQ5}h;*!v+MC7Ec2)*oD-zDp@I1r`kQBLc%8Z38|;+*t==0ELMm_C~yj5e>d|3JvAxX>=X12ps7GyV1ZHp z?XK~cfReE2-`f*GdRpRvhXYr4yDsP;x&M-F8kX7hphht8d>|3Yb70?6xPQO$RCff1 z4I}$2h+I9O3letV4PdW!;*e)g-~FSUWq)AF>i@UjM@da0lEA_y2iE%@WbzBZ|XVUlomR zdm}C^tupA7O;!&)52RDuL{5u~k>pW)xU?LMEsmh!Pi=HmJrk*Rx2fT`i$HD|24f_z zZcR?>vJQ*3A_C}aJ}U|NuAAzR#8#b#!7ob{2`o|bXtMY5V^X1$Kfgf=W z5f8W}jrEGkcM5JyM8LkBl-;!`4t z(3LNeA;HgFI|DxY+TE`WSyp_~dn6FDN%-K^MieRF6^C=eOEFgI5)t^7$<^_=FFcGo zsJ7O*5wLb)b*gVkKI`#XIn^w#m@MsyQN13FV_^TCO#Bbp~VyC9&uQLI}KBl)|D;uq%M5^Yoqe6Nsj- ztFeMafm^s@ZBY86_pmMP6?>eep_%$@5)$lFh4)cM$WZIAZ?*>^pT#}O zOLTXFseB84^)&V|c86w<{j5+sP2g=e7row5kK>o!%_1eN3&E^gw7|3WtIOR<&}1g<0avQz!hQ@Nko>1yN-s7kUnthA?hk7 z-0&ac`g&H>WO*WdWN#mbDa))T?!(WvOhn;*ibT19elSk5X(dsp8*f59Q)meD`GuPl zVwn>Cixh|U+Ucz%mqu{$IHX*MB10g6C5L#HI=XO=G$9Q3y;mb%_2zwu)+Lvx&$z{4 zC7fa&Nd=ea3g08(-)<+XEPT&e9}yz#7o&XcKzie(TjVV!l62ZzlQN3;k_ubZ7%N>f zZficU^)85S=<`AI?@i_JY=k!@ggr8gJ+9OjNH}qLmhB^Y;9naE&x!;rg_xJDgsXlb$tdvG30F`a)3(np(UzL1?R+N{hRr+i$($Mp=Qf)@&ke$E+Aw7I+K zx)?z5+S`yVhBHwpkmw1x%>?sG&?T^oU|^|>&iAeYuwwY@`>J7)Z^^UF20i!~DTfON z3)55E5@~+J7e^)o2!1Xn9-aT4c9va&~KWZ2xx`)IJpbUO8olq+4ntIiv7IYUv`~$(ChmxJ4UOD_#`PyD(40B&VA$5)c#q`tDL>lMnVK{uN@D%fuJ9G9`G8 zm=*t7F?hmPaU;xbb-0Mow3NNX^{s-(lJj|8asENy!Pr&xE#7arT&#nS`QIy!dmh~9 zFj}XTRrp*j%kpKzKP}kFCJ_}w5gLULK@G*h<+P+u@y+mOi-1efE2LE8I$tv>L=(u@ zdt>&wYkIiigXwg%O9W&B7OA4DWhzJn4M{S?T9N!6oaU~U#YLK0d?o2D0!qEvERZ;Y=l0N~8 zk)yXvW%*~J?pX9_&DWaw2;0p$UwGND(53(XSwsLCG+IK^l zG%w(}Q;~kYGsyfOUA+;@q6c4s{OJ}wZigp^J_A z0IKS}e-)E!N$WM!26VLFmO2e3e!c+k`a>!C#RRSX5MH;SYB1>r>0_nyku!`Q1Ib@&8n}1JI9&tdKT79)`TeQe+jKMYLW3H`o(|WEa+owB;A)lyuID z=4Spap&u&X1RAilin+A4GFXr8mZsFEV})4i3)D@RfS_JyWG)&&|!fFLURX za-^==SrRo_ox1Hhr4?t{BqDe`J@H6?q=;Ht@ljU1?;QGn%5XM8jT(IPZb$E_x!((4 zQ_{SzfB!0)?q+=Y@oApvCRsuTd#MJNIn-zLcZANQ3P4`i+12NkatRC4eP)|}S=jNT z?pbbajjOXuljBL43SEVbqlBq5%>uz#jNdb}&<)F1Z_THzW@4k`MEJPbroz-Cepx%1 zncQ7e@7=9bvVl&e>0$kLPh#p1Bx$?yAHQn>93XR_z4IzEDfZys0ya(Jh!rrit3cj92Rc5Z}CQ*y_P1OtYI)Qsqb1IA2E}wD$1*?FDCgV zD?)uT<5=#fr{J+>h3WTNXCfWwutcX~{52-~=j;vE^LeeJE|JBP{&= zXDlr?CLmdPEjTx!`NvpcvWMJt`w~%?*4R$QZY%r~uONG|F#BAkew^VeNLzkp0VyvV z57&>e&pU&EB>1>0@cot`O%J8_i`f8G(erV$+Ala&cmV69_(YtT6ZPOtaS({<4&PI3G2VQO;xTauM< zhI4~w(SF|O_qLPym8&lG30WgsThRrKSlxC{W4HHcdRB_^lE3loVV19~6$b`)xA%)I z&4S?)9U34@BvXx*F5rk5*EN9CKZyn#Rx2-04C=nY=gG0t|L=Vc))ZH2(%!S!y?rO~ zHAYQij#Eg;pF}sMs;Y|UZ74^x%OG5_zA*XbQwMz<;MNsi>uZ9dy;E^V2|t zcmy9d9{qHM1P9A{^Abca)6U~paIwz>f7yR8$53fqbmhp z2qfretLkcEm&6I65GX1tuCI|xdg;8Iv(NEgSb*;reC;!zjbOL_>1XZ6(hLd-mX#s- z^6~^nVY$l;2wQU_6DV|w@&myW{g)IYXtKu^T1kBzEUawIhm$E_cijX1pHAK;16TFu z(|FBF|cwnZ!B2G38=b z>dch)xGn=N1Sf1@6{OY;%h_LA;JoD#izT{(`ua2m&IY z>f4VWKJ@G#{9|w6MY*21cJ!G`4&x0nYCurd31A|TEBoBMA_Vq{I83s0 z1qB7@Z6*KaYrbeBY4Hm208ZFksOjV~Dozgga&>X@=bgq;u0w+!ZK?ly)X?KYZbm&D z1Ej5{<>ec#^P`_;?xy>}?6A~NtydLH|FQgDUK5km^9XhzkHQMR{$k(1nGT8~iGOQs zsrt^t#mCX|c1^`g@Co<7DWtv%{O5-Yt?+j%W;L^nd4<|3%c*{|A47?;`bTfTPU|0ABzF zqnYAl;i$7|OLs?T1@J>ZM_m_%kLt(`q-bXGLBk@Ke+mbt)u&(4+^vD~ekN|FdA8OU z?{ujR$@Tr@w`->)!FU$Jsg8G*DJsO)1VpIs|4?~j{Ko+C=Fu4;I-i!DX=Q8vfGX46 z52Qmco?q?_&0iue#MiqHeUHRH*wDXuG{zR+DP;!nInGI(viak1V*WAfNBam<@xABA z)Tkhj!ECo3k=g9>;?7ElbpNjcbq{7Vz3jznYuEV?QdF;MzNSXu2 zlb3Zz@mdCw*W?CXe;JN=lhx@%ippc68 zIdAf?ZMk<*LX3Rf)DM&dXdJM<7(|Bl{rDFX!(g#nLHkf2fC!d)^mog0_A3B=Sl>_r zI)Sv|VG;-K3t#>@C0c=Pzl|$vcH&_Jg(xGhc%Ji2f5!U!0;uyk<15%dV;6V>C$`|_ zh!~m|m3z}C_F7Uw@I>gY*PA{C?5#L_AmLE|tRFzFF`KT0_sa=7wz7`Z@0#ofeqOEB zh&IBrqC`9ZZmm~tgr<;wZrzgC@G?eJ__L60+bPsTlXjoe|hZCN08RrG*9|0pyDHv&-=OYitvtXotc9F_OgwU@c}oo zPTNQ|UyUiukeU`3TKj33kh9>?1^L0ZM|<~na@B(EjIVJ?zpa3lS6uWs#^l|103ag| z9o9_se^790qsI;X)B|gi|7U9ZX6=h4pVQURGL>(mmaUDUm+O;2P{@InJW!!Y5&YF> zsNKr2$Zc^=7L^TVr{ia#p9T?E-7Scny*b}*V}Q*f{rm!cTXy&=k_9`h33NE)%|kHn zKFzWBSp*EdJEFVnm{2iBW1)6K+~4GC>h*uhY`}1IT_L*17zE7hy*q$fNZ6$UK~y${ zCg73`g=}B+tge}E3>TG9>#RjTZ|pJog1kM=NnW8Vy0-Dvir)0At*ofKO=Gjtjz6h< zQf*!j=1Pq9;AHgvDKl=hETP00UQo8-;CtyQCN39gR+Z3wKWOn~PPAsfnrU4@&FZ+4 zXgm&1pZh^jqR{okICOLo5osNlzkzY;yyACH0=S3RU-yVP@ix9Du(6gr4WaW{do+u7 zD{>4Vl(R!n*b5vPSOx1ln1mG-wD`sYU^Mm{^|Lih74JI&Fe`3P2Fi-x(z$LlkP8Fe zpn#rqlNBX;++S2?Wb)pNB>tFX*yfm}?U~ydl={2DEF;kAPyuopjO;=hn4xEL<8Iv0u|Zc)3HTRI1%CFucJTgz$NVO4iNjeGYxn1*w<~| z2_2nDncb+8S(pUW_19B#<*dG$DE(oh`n4V{YaQiA`#-9qVD_u)V9RW?PzP}i?N=aEu3T%B&f88@Bw&_sUv16~>b&T~VL(;tD1Hs^a+;9?; zSAihZGv|SlI@{2>XWkvKb)v?mUGmEx11bdg4<1E8CvvxYOE-eBc!5#SI(BpgQu@x` zpLx|(){4>8xIsBM4-?<|FYnE9d}t3no%$cb=>Kbf>Hp8dfbRaMEwIY1C6eT%l$7LT zk(*u2f}UPT59FEsCjn_Ly#G{`^-Ia02+0%Trl(#(6_o^YZ~f-lx2dE0`|}s*c@(aup3i`_E8jT~KBAdIpl`@xj*qeP?Iav}am$JSmz^O$hnVnE&9o}Q>ffZyD z$jmLwM%0Bj^Ne(d3R_ZJbRcUH-bkhuFk7wwX_85X6;X?82((-Jn|4lk0Q$V(YbsOQ zdaa=T)m#{PaU=B{&Ac$sam#Uh=xxFzwz}Ti6ORV^1>3D8)J6iz0Vsr&yYE+B69A2Y zqrkEh2Y^YPx;*Qd*rb#My~P=S^&=H(7M2n}$<>>{-yhy@0_=n7CV98D!U8xwDJcbc zzH41j_~jQZ?a#@|s!pF2Tpb)!eSwRQn_CC~Lmw55bbwaZ2N|e10Gdw- z@$lZECMEl$nFQKn_mRv5A8=gN5i)ec*7=Xw>lPySfv$(?dQMTr0Efzhuoe%(cJOeM zLxRO67?(5b#`}{6_!yn40G7;RZhS6LM;Qe_6|nKIU%67iB_p*BC8%0f02)+%$IJal zR+8`d=qJ;O`XsL*`35_A?fIN%Ly$W<;}(GlZF)J2WQ4+15&kwjB5HbqN56(kg#9Hsqnkoat*b;$*Z_+PNO*-b0N^Vo_jjbD zpqQsXyX>kt?D>47@Z{|A(U))VIw30fy(A&SLH+3_B*p9Z*Ub_qf`{(D3XsUyo;x}j z4`>dsWER%7rt$&o*t5?9W>}!0v<=dDfKv*x zTOsDFIJ|_7;udzm==)EEG2a&LzGx+ScM0oL`%;b|SnvqJ~O;Vn^+M*6%Jg8$-1rrL8e4*CiWH+pb48?dX0A<-3Z!|deUY{)h zgt-dT!MDq4yU#wl$ffuUp~tLtjiL9a-giGs0-2~jG^+#yU(w;q6*X#ufzRY<8!vML zfszFo2t@U4?Xcxy4IXDsxqO!A4LSBJ!5dQm{{bM`{45lctsR#+7!AO;3O3D8RW19I zsQcmfLULCo;S$o0GEn43%>W8YT4pBZ#LX^%8T^T1t_cmFuBbQ$Q1!dpZ{UX=rh*U$ zm%iF{%aM3Hzb7zj` ztI8@-->oj>hx+Wg`R4bxbYFNw6^Qo1<=)Cbf*Z&lCAv2JkuxSV;bVY^W`I`n2j+E@ z)t|McLkjN1Y4h1*0j4uDJi^G;&JAs~W5(n5W|Ws*kgij6G1cz!BIo^@*yHsk5YLn= zq>>AF8>I{tRg&-XsLYuwG{OC<~@-Ld~ez zI1;cfIe+!B?q+Qq$U_kF-2@P;TR#QRZC^}z0tUttgf4$57!qnB?4s1x!uUQ{fk^C) z<?olBv2V)kn z7vYlrLmY4aPJ<>!#aT}44G+flJJG<1ro#rU+HMh3Dhl-v=8T#wa~&9EJtpdEkFj^; zSPIH8vM|i86nF&e`P@tpbDlQM=YXPp_6j~O@E>(_NTzdvm3206l0-w=?oJxW^?!Tz za@gs$-0kc_w^snz6*l0&&qWy-8POR~XQNaF=aqKAAOU7N*qDo?e8Mg4+@7-5*(peT zK6hpDxE)O#m=C+j4}XTmT~KHZrb>?<6m!s=oaklD&M=Zt6$t0$XV*zXTU8vN-G@Sl zWiZhC>1W@%OH=Sq0sS)>$qtZOaa;MPyJ&N6sXVt{_Px}aM^LY!prR$rFE0gCya@^6 z2bWB;LWm#0ap0R_67UPs6ECYBV8vZ;<1jG|bQLW~y=AD)A$>z!Ca;6sA8(HmkIbV& zP!hMn6sJkwD2DEB*x{j`g|3RJ_%uo%Kj;LHYSdy=JoD^1stioKj0;_y4(zwTPMSa& zr9kiA^HLoveJjfcE2tlrbR{`I*t&Vgg*9YE-dc`dOac#;XFa;D5JxWGW1{Xn@CFOr z`{>5)3=hX!)#F{p6b@DYE&AGYo+KGM)^YpVf#{y+ALS=9;k~1L6)P1G#EVwT;qR6} zqa6s@AAm^KG%w6)qN@xo;9$ryv5`AiiryO<95iey^A$@=`%dZ-V`R~PV@cTJeV@;| z*iS=67otWm>-+o7@9)o4`vSBJ{!ENvnA@0Hd{XVqjM0QQqCY#7+(CJsbYEHmk6b~E*=6fO2_0L77itV1}F ztSK;Y;PmM!z%HA(x21Y6umyn(ynoe{I0H%EJET|Z~oV-n~#xG?l{y;?<#LzBut zyOH^ih=PJqJ_EhTQMC5QIcUxnI-c~2GU#igZ5~B;B$Mj-0`M%9LfqyZRKPD>?o+{^ z@b~2Tqg$1~^S<{7W9U~zkn}NFPrh^xDnxQZSHB`>@t%knH=wg8VN_OpN8!P85K0oK zKqH=>-so+Eksqx|H(=Ona36sIZTIy$g=N-L-5u98sqlN&&B6g5qU# z*Y}WJDm>63WavMgJY}_1-)UM)j@Mt5yA!|teh50ef%DiUjt@5&BH(r9xY!HL&Vuqw zpbnolqly&mf;6OSkm4g(Cwc3*^6$EMq|R}*I35yD#W|D^>u+NW`@;3M-)$GDlc|%t zO@6`LRXHSZjss=k=4^-^DkK|Hl@;oqvu3b2ez8*hz8TneEgE;uftMdIPe&id7w{yg zQ5M5dHtwgIQ66_TC<`Y4J=n-4Q6qDWc@ zlxrib%};DE5tuuMR6!P6EFoJco$b8xYs%%clV+ci!`4POi>TNOm$%qOn`E5>_x*g| zqI^AnYVj(A{Dz!mbb^rCdxA&(QjQ@?;3-w3)b~j3N_)BZf#<*Fqk3u=`nMkCFH?lv zS)!=(j(tz2R)vP+-#39g4&PVQZ`U@_dhSq227~dso(LRQaWn_A{+fOJKuEKN17+vf z$&P}SZFIfY{>J;;vNub5YZKa52}7{W0k72hsZ+s^L{jxx;7n@OcQBlt-C8$kPyt3p zKt6M9;hvi6b}UYLQ60-Dd=Q=Ytc)>mOJWhD!$XRvrex=5Z8C=#jfUcj{HzxkljL!F z{ideTixwsU4*4(pyEo%TF>YxD@25BJQfHXD3LZsuvDRwP>bGq#i>cto1lONB-eI2M)75us)hR5eTkaIq$U;5-&m{bTJ{pqr+TXAT zwPo^5maw^(lO99Tm^c+Ibku}!swG4H*Wl!FR+O;M&eu(tKwu=$md;ariafyGI^;Q+ z!OBM;gOQp<%tkg1BY#Ep&sK~@&UzMt5{1z-7rc`%NKKxBJv+Dcj~ zv9rm#9BddjFg>z3l7GXer!szY;JJL0(2f6UUa0pDm^kr7B%4KMiX5LAtdPVW7t*~G zYrg1#@7)l7T4^F zQ3{IHAD>NK#0LP=5LL20tTZal2?_Q=_oOaLWK#e~X)U{#x1fvGoJaZHfRC=Zjr&r- zsC>yG<3Q;8S@|$OAcYA`x6ORfGEILHdI{fIT&FvBe%qyTj*iMDT2TRvJf?1T^%3bs6x$hA^WXfHkP#(T?X&J<@hk=Uk0e({ym{vf>z}Sm1e> zl9~m*RiM!bU1rvptUG_o^0Jl@rrudJND$O-s)8S{L5s~CXHH2UGQpBbK!(;r<*qE= zI5HraE&W&dz`!LD2@Tr}Y+03)g;^H6-+qEA#Em}ON`@xO?s+^hr;zEFLVt@e&a~|z zM)t^lw(x!#Lm7DsVz5lRbv#;22FDrGx(82lKigR_7Gn7tqLLZR-c*>YQrcq@mz5jd zAu6G>S9a*T6!=A{Q&sM1&Ih04Zlg`@$3WcadIp??oDum~`>}XP=AWI{y2aZX{A82J?yjXQ5i;Uoxy5A34;jBfLLul8{Z<&P zWn}^ehrjI-2!~$#fVbMxe`itd)jnJ%pN(HaCY2FCzvDt zKm&gJ$8Z3~KeQB`mD@{!pSu5EheCDh(9UC7mxV#u|K!0A%B-s6Nn)lA&Cl=nJ`3b; zr}v7+WftO_=rG1)erI4#)GNrHQnL*eD@q_p440QK&r$BwWc(T2FT?M$KI`7ThHUbj z%yW*$)h1NoYAJv)^?nKXU6>-Egy^luNuaPsSjB6x-)mefwVArCLQ#g!eVr=jNE$(v zlC$_*E``8JFpgv$hpW{{vr+_vH-Ih>Y|{I4-n6YNo2?4^t`mHiJcMqnSWH6K!BZt@+7c)CAu*8 zPWw=c^vT)m_Uh;WvBh&4sd`Y}BwpTRWcGAK_H<UMf!e%suG;!}>EDl1EY@tM zq9TXCbP80~=-~o|nN%LuQxU!WL%xmmr|HGh zrM|j-hMZ5BB55GO;S#FE%Pz)Tw)O_zx1sIX2DSneJ9~Q|iH%Ohy7}`NwPElJr>+c8 zuLRq7kSG9aUd?+XR#kyVU=-nIFq1CWaz~kl_x(6IydG^BcAhs1n0rFFsPOUTH=A#} z2+?vJ0eiNGWV|5gQ*l@UNloqcgAN)>DRcp_b!`{_gzvhfB0@EvmXjfFo@G{==RW#o z3Js-z0KQq$4_lAkncu=)uZ$4mQBSZ4jBcpf?9oA#AKG_@fWzJS0qXRgDxf2DmQzSO z3hZDUqkisnc|SKl<5%(>+oghCmDQiMV5v-%uFQ-z%I#eL{oEo9^&$ud=y?1bJ?eqi zVLo$J3!{)3oQ4rLU&1>A(mBE5+F|4d9>0zZg^hp0GTWY%;cRUeX&8(%l3Gj0Fvfc% z6o0%}yl^!}v?2k9m4*4P8Q79-aVnpo0n+;4BJ;MX+co0wH!4u3+01z6sgOK*h#hQB z#$kRUpOf>WG>70T{Ptp(z_k=0u0IUXeaHmqfFoJOlq7*^X(OmrwZ?;&zn^`e8>+OS zUgD>s`ZG6CXtsCv5#q5<@PMb8D0Q^0pzR(NVbi4Ot=c0EiU7?b@S30QfU5C;T*;Q0t**1B#l zKa}zvxGB9~XkKJCfL=6kf-glrDs9FbtZF%73J`t1fAtYF27FMT8CSdANEeK)h2y8|hM9VH|zCWDb6jVD~>D%VM)RdXwsS(&Q3HS&w zBOrUS{#Q|LM&AOozV09Vxy@D^wlEvm75rtWcB=Gb&IMdG6QX6?z{Bb3+L4a)^S?Gi z^lbj9S$ph*LXwFsEq#@%v&pHIWhIl#dVah{=|Dc}4%21ju4k~(WS!&AMFEcWMl2mB zo8=irEq!FAwZ^#Y3eOMkQY7aymA7u>BRfABQZ3H!jwzb=1WKG@YL4Doq;FFjS$M=Q zRdL>&Q&$cZh=`K_gw|heKIN+@v)o}SI^}tp5jf_+7G?XEDRV+-_=haFu(o*%bi=`O zC*Nnk0^QYk@eUbH{n8ot(5yudD}TF>%r5`&Q9c{z)wN&+uN!-2P5HY+i&Wu!X)F<* zwx=R!--1LO7OkFI{WS=p5IK8eKuRXx6VhiHDScyQq%t##c(3vIiW`@g^P7Li)6kFi z=CaHUGWs4F&7DUWdB(0rKabNS(U5KA)UpzX?m5bt9>p&q<@FR$0NgprH-@1fuGLN} zjQ?D<;*+|&gyjg;e?lMOFnT^zc(Rlq-&LW{7^?c+c6bryjnncH=LIb;H8AC@A?ml9 zT)0D1-m2`=;(5HQXL_Wkw8%Wi$0PaX*J1XcIaw?A`F}PZYG*tb;uSY7b35(chSR^y z=8khUeCBAcX^6Yk`t4;l!}}`VU4?UJC+OZKI%*jkMp|Wr@YCB++o)uo!tFV;fQfO7 zbH%|?55X5sQ!|qm80pEgEHiA?MsuFP?tyO6zpOP3^_uT{j;=myWnkY`D(AYArlMYn zZly5fBf5*M2yKBcx#lIWLC7~9p8*2z;CjQ#MhG z*n9-nE?XP>jNLY$49xtw_0mv68^u2Kis^S1azX#vy7Oa>tW%O4IYrxf|JR1N%|){*&#MB+Ju1_+KO+2VJ6P+2{^=fBsLx}iUgK@Xf)8=-@g_n zsjXHmNZXI3C9kd?EArE4olKo9%wijNkZrpQ2C>%ENb@dThM(W*HxF0woL&Gi#=@H) zbbM^y5*gl+l=V?=N_9&z2mcE?GNjem+sn(sMqI;EZ(2^_P~8#{{yE2SB}D&j1!3ua zm~KHJSAT$i8n<`i>3gPYBLhlKTJnIvQuMsC=NcYt&&B=G6w9UWnI&Jvl(XTbM!;EMA;Y=1 z2Ny;etT?`_G&f?ZW3H?$@!RU<;B>ysPcJ_ZKz}B}Dl>&| z#4X$+a4=-u)fnq-yX+69kW%sAT~TG;TWWhZzEu*%(Ec0|9QyI^6DQtyRt&HStu2AA zMQKi&>9*C(;1cpeE;;y3I!#>4Nex=Io;FVg4zUHgGT1m5oH^0kL!7Fu`r0urgBthA zuX7_g5W>NCsi3h?{OMfRdE;@7=J^-VsC3%#1!%Q4x~ zoh^KgUqooS35J$MSbXG@x^!UP3Cf*y7V9nKUD+ItM;HTTtD@-lKR6R6n9y!!xyh)% zGB$8=e1#JOwxp{kEL&z`cd;sdI>+dqwy=524t24T{yEs^;M_*eB)+8QfWgfMSvw}UYc=e)8h zIPGcUghgLT4Ca)Xnv1vP!Qw7X_7Gs|rY^?zY!z=%`O*)%8i$Q^tO)VrFOVnE)*JIE zC(-l{!=IOj2^BV=!1D-Ew_c-7PVohj+_OGmBL9|R!b4;JB#g`|SB7>;)GgyOvKC-- zt!Lwnz^t&l%B4!nj78WwMwInzJHGY~lKKEETX%$R8KFAJYE=XKljzMpHP5-Au(IrN z;o^D3oeV3HasG@9h+3M4Kf7H8v1$E+CtltqhF*&NhMotVCTxFQJR62?aK(&}^{rUk$YNubX@wcF|N@jt@urE1{ z=o+{P6XHzPWM|2+e$hBTZ^+{C_V4i`wFtb?Ro7`zR)RkH0h89zxcY5v2*F5rd-JN| zi2T>%srttd&D7t^cQrgbNS@Cx9-CHA73JklaDLIrIxho>x$H*{CIf9=JK)>*diYF> z679oM$mpgY%&wHu%0P0Vk9RyE=jVFjhrhRew8?VzO1usuF|i01VHp6F_?Tz%O^#ag zj+$DN3_s9t$fB0rf487#m5(g9C36rJi{v~vb=c+KNJkZNcFV2rT*o=$+%hGS-1#VWSn(mV0dTMfXRGRbC@u445mVG z8)s37Yefa9Vn&Q+BF>>)8)}t}kAH9m%)Zo5vruuWBP}r<^wzTie%nGl=QcV21L^Df zl#LaxLmN3nvk#r8(C=Cjk900}%7Ebx6Dho)V4g_tCr0IVD$9h*M}!=j4%u3VOnD8y zaH1congWZV)}U1+>XhRUW1Ha{WYYH*m6m>4;MhT2{D@>eay|yRoLpe^Z@^sj+|)`o zC6bHN`-lZntCFAQScDAL+X4bdNQn%iNkRegWNO@i?pf{DfSV_Y7=(ZdsBE^`+CZHb z5{P+hZymp{Fy zZW)QY1*9*2_#ezcjCUOw&NHdf zTxcP7_}maqB-zcI%v3jmorKe5@f-l~T9O154CE+e7@fZA7H?4qwE0$a!@0H;3fpz1 zPJrOV(5ZWZYLe1ZD$4gXEIetz6@nB@&zhUKWr7>ZMe_Q|oCRJ__JqUhhQhMLLh*k3 zNByNLrH$j8-&stk%6jI$APLyd0GH0>K3=DS#Tw3h{X-nYo8wUWOI5k%FQm55lJP|a zLn91xnVS4d1IEySW|oQ8ClVegH{pe#%L`gzQL&&bdt+}Lrn@`_Z`U8%6z1PORJK~E z^fLZ&1qODO0skz27VdUoK1iE(o5m__vG1*#D?p$9AGMujSXEuusHIy29REHr-uPB5@Ya^F8nTp7_q6a~&>zt!uBCbImzwjd72Z zIsMFgeS*H;u`ipm45U#n)H}{YK#b4#;*>!Mr;jafGft2X#Lhz}LDU*; zCiz6h;zmo2{i#xPKp zagafy^!ckE`3o5X)X!Eg7`di?1!OxJf5F-ldjNmO#4hhJV@%Es+f-_yzgWJkr5ELk zT&VGKQG%PMDb+sx@)PO)p){JbHqZwl@q1nTpaE-K@Y6ndSA&Ou;~7n}tNlVWx}%?R z2|;WVn_D&hfY|8*PD-0Na|j941lJTz!$F-9r8_-NI$)TSFi?^mC1XIS`kdPp+}(hv ztNf_0Jn!4CTt@9Yg&L5`LH@|l|0*{@Cdipn22m|i@fSxP1Lwq>XW;HV5Q4a)vzSr= zRP!q#LKjLJwJ;s>oZ|g}zy}YFtzB8?{81#@TSZg%>9>Awom`CZ08fEkHiy?9^?m1i zIB7(94gJUasP~cg9da7JjS`*cGsL}J)2|%^?G%7)mA@PzhaanmvaRlH7P};fwa|bgvW428eg@1fPObN{3<}IS# z?!UM^WS*jQfB#?AsV*Y;xr`Ec!xn8zqooTcN zwOR79?k&(=#%5#E2)1r%NUS;Z#Ld2TNB*_RRoF+K?lBxULh0!m#HCt15}sp~=8!T( zE5@9Xij_?2Yg&3`FL$jK^veMMe|JM0b?O(iN1M0Y-4BDBw*b`5Q{2pnw=&muq|Mc{*u51K z=Z2!A=5^$i7VQWTUUN`d#pArty9Tqiy<0KK+a(ihJoFr@^AS8nDahY+XPe- zdHY`5pFFYnH>+&LZx8c@b0+IQvN_q>XbYSTvPPnJp3%eh2Da*aVoLgkzNyBII zt!Y;L9eu15tl{2ScJgz(KT&0Pe`&*4`11#eRKGo#Ja<&Vo^g>@#%Qzu@T}#5%1et= zRBr~rIc`0gOeOT`nslDjCS1u*Gaa`YSQIMWtY-GfbmlRjOWWX^?iQ;3*DO-XKDwN=vYA-Du$qK{L$M^cu=cKBWD_&p=ztetX&HbSfv*$5o}bMU-;(A> z#Hjx7VRAs{99~e=iQlBeNiMuUynDe3&iF}|I;XJ>A7~dv37tEYGAH!GhqmFPq?Df^ z;tCI6j#*jGH|rI*ib<@l{idigNlu;f^!Ms25($ae0b&2MB}0H3;Yl|fxI1O0i*gEj zLlH-?vFwu9Fvq*0pJDfE%)4JMQ+i!q?O}2lOeVA_TLibh06uPhbNM3?y{5I+23a0x zj5%7$O$x+BVIMqe8c71stvP&%zI~r z6jDxisvn8eZDwT-YJTLGeLg4oPPe_??ZQ>wxM!9(+W&H{8Ol57Ra&N|(-c|uUHetS zzEB1}DfRnp!kVM6hF#TNuEdwwPfq}30vh;EhnU-hIISD*Ow}D|{`=NI@G_7-6~CoQo&pD;Ft1YeU!vpPe~GvMMgIN0<^S)(&dC^=8d?0m5xTp8>7ajvFAgP6v*a>+ zQzmqe-$WdP^N&i183Cd+%kF&-`{}JlQXp!0gnTqQjQk-!_YU{}b6Oh}<$ozXF)ETd zf^;lNz18@j8DrEl;M&+no{Kmfy;Uer)&=m`Qtv0-`+U0UKuWm0_9G0K-D#wDxj2$$ zKv?asp}c1Wo|(Ok12@+XpXjiu=gKwogj*GYONk4xGo-H1m>RG71fKs{>@!^^+mD;^ z67AerlAs&xefZ8P7%<<)^QV5J`r0GU@}#UH*m7DcCiD4F5Ke@dx%l?6_lzaQjz>2m z^fARPWamX7k%BAUvKo5lLrZcRfx!6`yq@!#QM#3q`jD`_PqC4%$WxKH)Fy}9C@lCh zdlo(T7K*<&_|F$T#@^6q-n>-MXD*FURl2J+dK6-(asQhYuO^)dt{;fA=KOyaC6(v; z?TuHgPIfEvHaN8lz!@E*<$qDkFxsTaru`;&pi&0Cu19Ncrau6I`J@mWd9SzC&ldzk z8HZiv2-k9k2oC0p1c%a4`U>!MGzQ74hyOl3VoeiLfU)!bc0!~QcFHEP`5w?GTRbBo z#DD3NFQ}(T2&G{g5>(R5>cX9$9uHi;IABxhL}@Cpmh#uS6tH@6DamdLFxbt`dtQH* zXGW;L9c!gC+{*xD>GyKiykqaVD_8Z>%q1nTJ)lQkMf|UNpWGckJIKMcz~8VRWU;@j?zqPM*jmEZMGA3+`wQGRtQLD&W8<6w5rH`BwTHaUiqbrKae1su_&DQfLV)!$(iArN=LD#_cK%EbJadd# zdZAsLitf>nAWi{YQC)QuxXYRIO8>TGz{5S%_&)@mk6@t5Iup?WRVOt ziz?Hj-}Kpat`q{5iXm?as>cPUbqcj~+>&Vfy}TunyiyK!7*`%48`TXiANt^+y`qo=lPu_4G}(zXzuzJ1pNoWRvFp&x(l1-IiXIw}q;v=BpzrGl8p4EqjB+ ziLgJx5_L3rKr)Vx+WE03h3eGXMeyWsQDCOzTQAp64!m+WO`}4Pk@508?*0sUGB>JB0d!t2Qma|cH*}5_)4v3?ZeJl>ml4X5PY~&TmoMlb z-B4=s+4zCRL6hzi1q8+a8c$Hq&6^dz(=#JP?wrlKQ6GpRPy-Ze(=lwq^0YBy`Pfx? z1=@I7DStnp_?Dv+4TiS%Q_gu8k zT7~u{tjH(-QMpr`y9nTY44GiSkWu*Z^n$o*te4Bw3@FhA1xX*vfRYNkVW5-`YbZ*Q z90{6ozo=pQi~IU}m1F~^=Jkwr0OxzqaC)1&G{l*=KX%9f6``MmPFZ=W@5Zc28=zvdWEqRQY+DTK%WC5WmO2rV9jMDP6SGLQ)az(x*`yIEnkSDN^Hoo+Iv zCq=ihlIUtu3p-c7!5ULasWSLN*qtH-`jz*)gCVCy=xSWnucml&-|&66`r*lck5sQ#bxPU+gyhKMyfiJ8 z6Z+Mu3rBOcs~A-Ye5rzjHFnzd_!MTrP_XtITi?IVX6zmZ~qz!!0}iB94vO zME%!QbvQq+c)Cv`e^`yAG z+a3Bv5~h^6nWt6XfY7S;RGxo3vVi}6uSG%^9A>sd)Wwj1DBEx@b*48TWI+N${q$vA zhAT$f85Q@CuaX9rpqF)@-iTmDjk<#}0WQdc+_Xzs?zxdpFePzL_Lup{*FYJlA8$1N z!jZw7Yc3jvEki1crckvGZe)Y+XG;W`_EgczyZW@^=Xn!Q&~Bj@jRa}MoiwikvNz4# zbLNj8j_JQWwk?Qm-_D9Ma)E4EJ!U-^16!w_%&f}kVYH*@mG?hHJ(gIX3Geh+wa#V7s< zQ2|y96_I!aAx?C&p)JZ_Aal5t480D4s4AAJ#wU%H#Mh1ZDArk+YFsgTPWNk>T?6U> zLC{+e^=G!~G^jd7uR?Y1-M!&3t_7>)bV1IdRQ>8-TXLhjv6^wCyS5;wEDA@?Ua=>ZOWQ1FTz58F!VLp4H=Ie%lT&#FgX3Kxn}7+XND}a-Yl{ zKv~Sdcb+N<#g7!>(fS96?Kf4iR7EICi@jy<%{as-9TDVGHAAB=%`BoPqI;f*&c!a6 zfKS>RpMbwH{drqd2r8TccKBU|D9>z+ZWXV$#EfO0kZl}CKgEKd*~}TpN@}#pqpDUT z)=6;X`tsskCT}H4gKyhF*qP;9o)T}Pr*iJ6Y!AE!K=gb$t$Rnnn^Vkaya(hn&Z&Yv zi}TvItI~@$2y1)Ope}`d6_3Ch3A->wgMutkMc>9NsdD_lCr!bi#Y)E~MWanh zr#6;4$NPi+f4(vsR2ln*)=SCvMN#~?MefN!t!=WTlX2I3CHkfZgi~y48{l(z;sDq< zJB3{;Ih0JhVNi$<~uk*pXJtPBi<>z#SI!zclLh!QFVpuIYR>G__@a=3tP?f*0pt2k?p zv9}MI?3x)WMczpo`%L&;Pci?kgIY&>V?c9Zyb!+Yq;pGvlj7n-oO-4Tau<7g2Ty~| zX^>$}*c!|7N(NERV|E^OKRhtPdA|>pDQZi|d!Zs0Dbw(9srv|}Dwl8!{G=E}3DrEo zpnS>v8CWn+Czthp(TsnCPyH`z9M~A32-5Yw2ddW4HNezNTy4Vdvkav;=xyHp&!_Iu zTy(p2K6o4y7jk|s$xAmu#DC_$5&Yfu`3agSotBhrP@;SSWngE z_(4>jwSRDs2>l#`865-T=uw*#Akrd;Edn$%Ha0dPAvs`+u7A;UUam|x$O;W_|J?Z# zouwQ8hZ|5$vFrp}0;UDicZ=0{~ zupkC{UZ_tK`LcP(Mwl~luD!4W4gHFI-EeM&rPa!7 zHtiv734#i#Or2c@|02h}-$@q+a!;?j+T#>NINu6#2y*aSddC@id3hOob;8$u`qMUp zO!VBl_g(d#wk~5>PcPHXK9kl-MhM_2L-J)cEc!E!z=6f~`)E@`{ zU=<+gXozA_+Fm4ql6Q>5x7&>3ud}r9XvbbX05Z}oHi!4 zyS{jRIb5LR^4pxU@nEn$LhVW0lWIh=H$I3fKI#_OR5}A{FE7uF?`{!+z-<*6OxJU- z`VvpTAQk))Ux)SZ_ZvzYDz;RRkq~2An)_|}sQ1md=#I_bgz+z)^v5~%=?n6LKoK@4 z*ViOs$%rU4y51X`(UrYJe7xa1ga>oI$r;nq`>^%oWT9ET$GeDf<%p*j{oB8Z?l`kP zZh(l+!}Cw9%ESoo!6Mhe%Is9HBpk;^1=1E0&UQP?ln%NKEh*~;u_!E^n%$YX!~BXG_~Y7xexsHn*H_+34^?Ju zK|U@=7`e#fq6bZnb2e zeHww!w%Xe2$E0qcrlf|%5{Jismi2`R4r6Y4K2=9CHYRmte#;+{Nv1K_z6zFhS2L1! z7qxeH@xdJeX=5tsmqnl;98iD`9U9mTi36JQ%Yllc@(L%9*ZYs9?GDCY!uF!VkMetF zc<8NJ($XqSyd2Qkx!FIXaDyQ9k>%Z~0Ba#FJ~q$T(?Q$V!O~b+Mod}8L0dxB^Lq94 z+c=|_lCr*g$H1UE)J?|7-W{MI8d~HSM0KpqT$RONlmN*8&4@QmRar$d7B8tJdS83o zB9o-(9FU~o$bI|PWaqT#L9|g*=UY(?TUwf&UEZ^_Jlb{8(rfbg18dTqi?-|^J36+p z{w(g;?9$+Y!%9Q`@(^^73LFR*wq=t)aM`9pN4*PRT zw*HHf=A%Ml3kx!_Kw(BdDDT3=3`2F9oplG9k{)@Fi;g7E0DEWeHg|X4P2l08Sb`(i z?S&PUO8dan6i;4`DF8GyZhb&Ve5X?5)IVXKS|eY=mWW|e8!{fQM(UBIT|fA%{85}Ki;rZI&M@jM@@uMugYVk*uY)D}rlY};WA9DH z&1gjL51Tuut$1i?a;Letvm=ZSUR+-GLA$%fv} zrAV#P&md~R?`J18qOzNQBwM0vo9ae(nYOeb=UP+lWE~hE=$Til#q~MBl`I)Lk3g?AEMP%j}q4rU459aBnrJ*sWr%Ov+V&~#E`=atzXT>StTYFi%k0$f6RT6#%g6bS+14vA4LbXUzQUrKw_=~-OT2$?vq zn%B05M-AWGd6^En#;Rm?7Bbe-Q7hww{Y=EKb8!+!gQ%}XOoR^rw42*ue1(ybHzfsS z#YLqdbcOWgMbe`KeAk^3Z4blv0AfpbWy<(1HsK8-Y;rbTNAV_AWt7*pC(OX$>}Yb7 zPXx`F2Lj{oHZIA?vA*BF*}NDkp0VRUXpT5_&uFdWZekjg>BFzl#3> zod4&5NuKv|$njMbfZa3}94+{34=gq zljILxf0|ZcDc>NU2i(SrDs!DT5=$9LIf#-={*kev*4ip`kQjqNpKL|X+=qBNnLqb(UFRSUJo`BlCd1Z94* z<<0w~E5cf=Vop44f)hM!fgP*pB?TRQg8fXa5bcXr_lO#jxnU+o;YX@sYTcF4Q#aSM)_cuA%CMKpqR)U-JC4$Lzn-$GM|Clhp4kK>Cam8 zn$ZNn6Jz)@7*h2Iz$Kxi?Anoi>N17&i1IO-Snp}guL%4ivzl*nho5O{ ztkpk`s@GVLWKalw>L&7|Am^ePL;c~GM%163$IF`XyFq*VGZ=b=%)|tzhCvN0HRpk6 ze!BDCmIkngMc=Fze&1Mc^PX^3Ix04J?A;D1_rlj}%isaHQrD}E^*ZBruVVucW=z)tsx*R`+r(M_C! z5Eg8}V~qf8I&{EfaL?Z;9;}w6udlK4>R9xdJnQntSyM#il>n&$Pb5-ae|ac9-Fsv;(s_|8Q=|_$pC+`XTwK+d#;+ z2aV46Bu7O-WN(V|P(uOgaEk^kl6t$;AM4$502T=R$en@`F=FegYwez$b5*Sqz-#6L$1|pu^9a389htD|J{bGU)lvL%m;FDCI zPYkL|R%eV@s(K>?%)2AOYV$LMF~t*PU(pFuz7jDD#~nE+Kqq6QXASr%YD206d$p3J zTbWmqh5j;FeAwown6(K$-OF;HWP!hlZE{!#pDhA%*qj-oG}Ktrf*+2__bvz^2@ky> zh=!B(8%2{aU}Ph&aRPUT@26CcG@X|Gdei->(stSz3tTT-rmLc|5~{!Iq6v+7(*n;l zGiNO%5)3u!S+AwdNb23Loq1lOkA=w2$wR>uY-B>X1N9xxEuIBh1GqS8jlQ<0eMLHg zI>JmQ`s$64g1h61T|!EjBtD;DP-%If-t-HhAA-bzOY$y5zjVJ zRM4f-G%w*kf2HH$!pdl<58@LRv6hty%E)F>$D=?P!w6|E-fm_aztL6AGuB@R-a4Ftm@TyRaHa+g_jb9g3|HoUcWX{1;DWO zFg(ED?8JD}KsNkc8+KNSh~Mq(j~xv{NXZ~84ylF|!&^l-h6gQGnCi&;z47T|-VA9V|bcLO*L_yxiNX&t;>|Keatd-|yciQ~|ot!&maxvR% z04+LQ;|#-#D(Ij7FfF10yg+ptT$Nrem@CeCoX?a$3=nrqC`0+{i{7_?#MCeMoR zao_7~yL#7SmH$Mk0fkI6d^>s`J^SHBMPp^poW&uXsVRUz=~%3(&cDh%(Os z^s0o5aG)ok^4BK@fUaK++|fnFu+(p{#C0t0zh-Fe3w#;*_}Te@{tB^i2FyhxG{7 z-vhI)XKk$yU-9Mnw>DKqZ;n5k7x8XgRFClfX_jSe;@}jR-8$~5fNVebjh5Yrs%Yw> zf9)Um*%gKM`&!p4FNCjDzYb1>^~?mx*6DXj%>lQy#BW65ZH3W`cZVe*srBPxhZ04W z`>ajpMR%R+X{|n=+M|xjY-b5HN)=?J?Q9O-5zVz&OqX_PN1>dYEqoL-#nYPy?VsvYoj9*!ec_ny{T%LR(V6e`&d zq}>!2XWqLJAddSE;oVMPVMVE{&q5s^1};fA*bGWYOE3c3HmjzkBJ>Y)4;qYz8z;`g z{W6WLN)LU;k!H}nH4#XOd-~91&$SoWV%I0mF*Nj$ciOpL31w+Nw&T2}Z6Z(AD}YQ( zJgmjAe{}S8AQ{Oh;pCXxn!zObuDy<5w{fU*Z3Oce$2nG3(Xb=8vF)fBCqwA!LH6#W z{5ZUI+#|EDD5``uQjVFCUF|todoZLWb60MAw-UOAdx3IjR2;ghKBqQTy{3xfefs=#7s5?6c8RTNB!{J&>>7O5) ziv`@}wA2uaKfG2r>$O)S(7RZuKi=*epJsqImLUc->0x~tm?pCz<_P$w09r7bk`pC8 zeDYM3h(eum;HL76pyI@Nk@lzJlCr@OCV)=5M*#}l%|>;%JRm*mAn3)$?Ndw@g&DHd zcghYHD^*uE)BybIeccs{7A(5guS-YE_>chh7uIm8l)kb$l4#%iF+`>>6tCQoX6z`m zzv?WUhTDLu?`6X=8h!}MTN@-*QED@vd~#wigJ{t9-CPul-J=?^WihRG-!x#dsKepb zp3u+C(t$Vjc8@zeCoBkB>B~#}@qI7r33hZV@CYMdj%F@t=!=S(@HgxzHl0Fq7Nl(8 zy5LFi_q8?(z1Spbku2p3e9;B@xhna;M zV=^WX55%@vQEWywkozFXk3Rd^(l)5jum^`t10v~+X!VAXRc>@Zw77b- z4b>!|zRuan1_DcgrbJR~#gcIuB}cC=-cikAVWLe$si!X47Jk{?-4CwF%QH8Y0Ac!6 zCB>`BI&fEi#rb1c5lW`IPAU}Ih^0ot2de??B|a)NjQZ&?@UO_ z5(Dr(?rWRIsrK~c8K^rL=2*p*d_J(ABz-@vpE=Dp<+z%`hNil^x5rXmAQl#Q zSBc8Y?vtqN^>b^?ezTIls%@x|#a=+!2-MX@eG>{9nv=+1V)a5?(A87H@WtBh24o9~ z2zy^|@1fG6OT!YVD{uI$!jeX`_5#A}{GxqZc5px`QUU&3tBOqIW;Zpp3DAh7LZNv8 zL2u{FS6+5&JpBlKeqmuPbtUpT7Cz2=u(dT=GGGv|8gqUy>vrK72oXq3jPDKneAC;0I!|)ro6cKTfmpQfa!tj@+IHK!&4R{YbEF4W zzk|NtieW#XPNZFoQ*l^h027F&+W%>Pp@=dI+TS5cT4MBz(zJg2piI3X5Aydvr)by&K7{1 zdnQr~jZQ%(kXHlZtn$**GV;r5m<9v8PM7V3KokOF(QKs6V%nZbzJI8k-n%= zx(gM5Q`0yZb$W%llAcbRkqXo){LA)pOsu`h5Gsw?8T|?eHB)CS2daQd^|_vwO`ucg zAR|+Vgv8YNNviu5v3Yti2lZIYy|Y?+LcEd@d*%ik+grh%yND6qokh-3J_bJIZ2=kTa%xb_@XCrV17)(=1Sy zNtp7iQ!VLTioK7$($}vF>wQ6-_ZS+f&dW%}ihR@4&Lzxf$ z^YmT}Sw@+GqOt58F>D(_ zV_Y9eCLpHqvQDj<@|e-`W3C?}Y!1zPT{K|=%(7-|S^N*4i)esb!N5?+XxRDlCqpRB zA3pn}VgNI{U_p@Aj-3}iu>Xry*ZnRWe{g^iXyNe{9RqcfjGSDd9lL?~V5LG8=sC=M zylXXUS5#Qog;kY<$+J)jv@5=mrXxT`4t8*`pIr>Koawt*p8$+oXI8A9?*jtMHh#&?o4Z7HKejY~qG_mUITZhi_=qa8ux zrl)I&%9;^}QBXouf9poxqDah5O*!;x?HJzzlwS~PFSd7wE*mw(W+_-sD%7)fs;|Jq z!=uhxZfNk0SmtFj5KlZmXIw;69VuhgXuOBIIarcd6%SmF<%@80E9t3tc6=xbjg820o%@9t z+o67{{m|G%T|n65C&8LY2z0OOP4E$UXc z*1T;UX~5pWiNa{Rz>mi2Vp0mJ(>>gDK_y2c`DQLkrCw%9zpd^B&8wO#XL-6Se~jss zFnfv9R@vd9>ek<5WOe!1 zoe6pP*(@KYj%~G*$$T8vb^ti+%S{B4@)#M9_jq&9a?r8_1qCgKgf7Ov_)#3w!6)g!M-J=q9l=%k?Gg5KToGsRN1n&wp>n& zM_0p3(Ae_Woeb$SncFdNvsZHl-Z3bW#41Q{3#dc=Mx;(^PVpSkd}2}tC;(+&<>D0J z0j!|RO5%CNEGUS7;>f{n4isWN_KKQ-(ZsYnjF#XvEurSh7`^kWc}>3?o3L-ZL*)%M zSO{ONxp?Y2!vG<08YWAN3A82G>n9^>le3=Y4R6o=mKYNRmyx~L+<9!vQzWWspR$=v zM2M1ELNrn&z|OHN$u9M@VBw*>tBAO~24HWf71SQ;YH!?Nc8(EV`G)2FqPtUcy`r4+t@%0?(-$8=JcJyFqHk z$_{2OBde>gT#V}G`3lrDwY6=%mFgQl1Pd9^y(A?C(5%*T^?cNvR-d|==w~F)l$rmS zX=11kGSK=#K?f$@)J)|CwXJA`p{`|97v}o%);3A1FOt-=BpX!6y0?ylTwI--&NeIn zs@w@m^PkoEg5a=s5h%!|QJUyvV!vX~i-2GfP*i-!3v~H{@&duu+KxX^P^#Guf!U_! zN@_bc90ZYI%F(!aec(N;cU%31Oq_d#=k+7@kbTdra2YP?@ A0ssI2 literal 0 HcmV?d00001 diff --git a/book/workflows/merge_request.md b/book/workflows/merge_request.md index 4f79533..10a4208 100644 --- a/book/workflows/merge_request.md +++ b/book/workflows/merge_request.md @@ -47,7 +47,7 @@ Solving the conflict. ``` Once you are done, click on `Commit to source branch`. Do this for all conflicted files. Note that if your branches do not have conflicting changes you can merge directly and skip this step. In that case you can skip ahead to the next step. -In case you have cloned the repositery you can also resolve the conflicts locally using VS Code for example. You can read more about it [here](edit_book.md#... GitHub Desktop) +In case you have cloned the repositery you can also resolve the conflicts locally using VS Code for example. You can read more about for [GitHub Dekstop](edit_book.md#... GitHub Desktop) or [VS Code](edit_book.md#... VS Code) 6. On the page of our merge request ({numref}`gitlab-finished-merge-request`), we're greeted with some more information. On top, you can read the description we just provided when creating the merge request. We can also see an "Approve" button, which you may or may not see, depending on your repository rights. Next, we can see a green checkmark, with a "Merge" button. This is good news: our changes do not conflict with existing files on the `main` branch, and we can merge our changes directly by clicking the button (if applicable: only after somebody else approved the request).