From 9ddf90aa3e5b07688f58d5e1f29f099329996656 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 16 Feb 2025 11:16:12 +0600 Subject: [PATCH 1/3] New Sub Branch --- lab1.cpp | 7 ++++++- lab1.exe | Bin 59237 -> 59276 bytes lab1.o | Bin 4898 -> 5137 bytes 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lab1.cpp b/lab1.cpp index 43a8ac1..4bb28ba 100644 --- a/lab1.cpp +++ b/lab1.cpp @@ -1,7 +1,12 @@ #include using namespace std; +void newprint(){ + cout<<"print from Newsubbranch"<oHNs^S?l+mA-vs~6r zP3!^IMenm5)=Uv{4$EpCA%Dc2W5!6*h_^ZfF`0^TX&qBkzrpq|(jf zX3npj2c>Hma+!`6Ns?P?Xs;dfiVS1EpQhmTE4&o9sTvaQc$d-lJH6`WPUvqP$7<)( zlVL{rjudJM`(|ZqPX0oe`@cHN|c4%^`@_Crug<1xJlB3yqTGH%)Y?Q5Z*pxMbhFSaq!F-+sUE zz(6>?Y2f2J?+8Awd%qOWUUKP=$U~B7Soq-Vn~7Y(!4%h5zHh)!bM+{$DQVCdU{+k` zm8};HzCX~q@KnS0eyXLzbSONVouP~2ne10|Gkn-xYZ2*hc#_@vt+!Zg!(ZY26*JG% z8W;?MK7hzpC1e$M%)=nQX*9zywqP3A4t-#aVuo?tpCCyeuZO(ryzdX-J*9cE=54SC z)vcf9Vm7O}j=HYCr|E(rD|)I5a0y=-ePhUEYbYUN@gCV(?;5=<#Ros)R?6KYLw}E)LRJK{{EbKbq{%v5bmaQc!+r z{!Yw(8wVN-4T`(Kptww{XWFs5^=H2+k@BK5oo~$L@(*R% zFyvEQGqNlruJAqD5n)ohS{^Q42?yM|H+jvv zruKmSLx8>IHyzbkjEh+@Z8KUDyGr=V$2L^Kj^8vL zJ*4Dc+4O7Uxb&~o>Bely#`3x!$}-GwPq8KWE(8vY859>cm_0)i;*#O>;kZE=1&F6Z zHy=vsgxq5$0#F8DR2rvbS&%Y?4#tgTN%Y6KDJdOT-VuMF;m)4FRQ3P(0JtypV0})~ z==f~5gXYI8Y z`E;Q(4P$=Ol7O95+B`5jJVAx(=!JpSl+R}I;rlWC>Dy}IxC@Q^7>gzaI3u$I@>Vva^C>^?75dL)N1_e34sqj&l-XEB#TNe); zCq+VsE({#sWvA7xrUvanxDkL6E}cpKEvu!qDVyZ)Qs|#4o7ifqOP$EZ(CO4_c8PM+ zCb9-vo_1KiF_0qCKc;wd;e)TDD)?!4DoCFR(mg@CE=bFQbXJf~4$_f98Xu%Gk=ZtL z+Du78K7-!_*JWjgE}ui{F^h^DoP@c%|DV1;`?-gCP`&zOv+PUpXHQ0L@kmDoX=aed z(*?_YY$Qcx9vXnvG5#7B=o^F7 z5~RK3wqdQ$WXkeS95pMdYAvNT)s>d}OV+Gfy?Aj=an+LL(v0H8BYS0gX~F7%O}isN z9j)iHwz7erb@~0n(GH-UKs$@}2HN%3g@de&*=cjm#7Rmp>|R@*;Q<@H{jRBEzx_x3 zZeqFb#d$MDDLZ|YdyaL|$-y>aL#mydO_Ee+mn2Tx(YAr-^j$O$cuo`Xg+BnE(=li* z;2ogH(b~X!K@$=s=`45)=tQ*3;0r+SLwf^!A?R$hPVjcneAK|(cF8FffEkC+<%e7W zv>NSO@D9)q(0%~l1Nse`p;(fnWE_rY(clX~7oZIQZ|8i9BqebkbP1XbyaTirZ8Z3L z&~0erz-8QY?}*54;7mJp+p1IX#hy41xE8K9wa&JHa=DM&gwAfH#6Z zfz}M(18Tz|>;=zhWDd3~mjTT~Yv(xVWVDOm3!Py0qFqL(8FY9q(#3^9kD+ye_kw;r_g%9H-nBCB1yNv7l3|*CM|{zZb^PL19)i|D4G$x5i|vD!~k?G zV1}Y4fwzH9KuhI9!zF1g+TAc(588lcX>A&|gzd?*jp&3~2CHoY5HcFi52q1fObVNf zl@5-72%qLa{Z5U{jg$)#i4`YAI0hEL27;#ZS(aA&-B0z~Q($C0t#Ji@ z7TGf-Fqk>CHF@$|=>vMVK+?fyE;z zUFEKTbEw>xs;8?JRyx(3O7`k7IggROB9rnf6KIx0g>;peRXeS$97Atbq|&REg{+%0 zs?9XADuLB=jwMrCwUu_GZ{dC2N|`$VC;vjG&LiohuTExO09O3m;Q}8*pi>q2UM6Ez zCY`9>B1<~5IWn0Mk)^a&IpSq@v2}CJ+IMMZMOm6c{WE0XGWrWaKf zuc+eVn{_<<7D<+hifWgX7TKisAcEfjc&ecIu7Df@k_g*etDlrtTT)jGxk6P&lKQb5 z=ozW$v1RN$y}w~#R2}*l#K_%r(m8N&1^BQ)A8*`A`aF3{YO8BjNzy*-BSsHa_NR24 zL3aio>&dys$_nV{nn##I|HiwJ=GO7|NxbJ#)Y?aI-j(3pMd#L<^_QUI&{N@|WV*dJ zA@NV>dV@hDhj=~)(u0ho3@-{M!xG+`3O=rnLNRfQrcKj9tJamXHhOQJRc?`JQ$q@w z*N0VF9h56`Z4Y&>97TveOtdHkL!zr&KnYvFIFr6nhl*?~ORM3`8 zjvNEsvnh?t+w?SPV>Z*%vW-@`FdTEp#57;pST1*JlCL==$1+b>DW*s@hc zt5!Q4)it$wOAvGLvB0A}oIK6xy0Kurbaj)NJwUH-vd*mG!5I3^xq%BqF)(Lt;Yluo z)zgq?fplVomxq=YJ56ww%Wq5cqC1m)NDFIH=}uQTz7JnIt+>thuSa$w)a>-^&L(HQ zbj`S|HJ2nO zjooP-5Y}+$AMUc47Ej5b5*8%Bbs_D(y7W}U>qMwX2!bl4dlrC^GI!y}g;9&&9U$~KDKWtA<);L>H$x?Nf93LV~M)=z=~ z3}DigkAiKF>l@-qAc_!TJrFxKzP7BpI3mdG1>%kGwbQ#S79&UaxwZz!SsHELdKc|< zXE6u8fEC`&*E!0AjPa!PW8w5=`9Ss;8o1l6e;)Rl2k`7VUk59pbT#*X2GWgPsUbIk z7;$|HR0ZUvusiVO7Gx5Ecm$cTKy0{BiM7;>4`?9hG8}_B^zQD3Sd+UNt@z9=#QO$q zZnVnA#9(40$*>`rK5NX1{XA4_Jb<5(`EgUP*o#kO(T2yfSQs67+^jExU+DA6t>q!$ zj-~~^8wkI_X~=#c%>v@(TDZ(hdgNl{B`=$~MrWc<&%*Qx40eUp84~TZ)>^FPf&n&Zs?BHk;<+T}kWlE~dkKa@cFs zu_q*W2Pt&#Q~9(T^de~FUWF#_%cq^7?V$RfD|F8<@@X6BSy1^&g~mUfPxYXuL2rZR z@6V?VPbt&}`aS5#1Nl_9Pa!Yp-$73t%%|F4DEN_iZSNTR8eFr=Ii6Nni^_cg&Z}}2 z`xX4u;c}mVYgf7D2NZUhP9E5ZHy>Gg5dSDqxxazyqM?V(y1htOH$8C38r6+Ea-izW z^nUX|dh(DW8)WJ}lqt`XsbEv)pifYZfzKE(uOZl4;&Y6rJ{47!Or?ht?!K&cdl!<6 z-UMPy4IqJIDhft=5jk{EfsxaP%VcA~`%+mw^uDL^X0!fYC|FX}PvtDIg}7&>@Iy-m z*wtLdOQ9`A{Y-CvCW}Rq`-oXz4MAH#XB}93NC)7pBV{Z#q_em!mD1N6@G<<#Yo#|~ zp@8B}mC?eZ(`ZjiK3zYmsC51@h5ZpSDRe&>@ZFC)RZb(1S8(pxG4%Fvg`%I!r&<4_ z&@RwUP{Z^2bpJ0E+79{#XxNE-n%<(&7SPKr%AObU>E34*+5~zL^as$%&ndL-#e8Z9 zy#;#D^9nuoQa+sp{T6im359CB`E>dOUuO2gM)IA?r?waP((*7yzNlb-aLxpmH0zPEKT-G4lsj-H$bNj}-%9*bZazW!7t z7vp;AtqO~$WvyoYlSptq|0t=Kr+}GK-E$nJls2>OG&l?LZPs^y+biQElFW}+=^b>N zLpRDpZPERkd(UM)EPa6ScKS`5+v(>VzBjyr0@uWJd_OP;37?1{G8#w$PG{|;so)4y zG?_Xexj3LTWG@i@aH|2!M}c^GR3YS)ldB1a&H?cV?%x4YuNHc*p|61`f|eghv*65# z&li92sR_C_1M%R)rA_soc)Isjna=4L=n@>v1#($Hs)6(buZ4lxYzLxcu4qX~-3t6H zXjV7ACFt^L$k>JKz5;|le%xRKcCI-&gk{j6Pk?pdT>AvZjT{DmBkem)l2Z74Z;0csQKvJX|uBv+;Sl^*MT?$ zymM++nlNT-mi2Y_@5p_OqY6dBiVbOQ1S&W-^Q>*y?y0>RK#Al*V{ zJ^*4D+#qI+zO~0hL9sPv*N}0RS4Cc!s2y7MheMr(=sk%V$ktGy6NRJ zX6GDm{L%Jh8IVH3>rNoIgv=ZSVuuzFJrMpGAT2_MuK{Tn;^+o~N%ryer4x`BYWNEp z@&nl?IE&*OQ8+qsfMf+VWNAsThWWqmw46`mS~!F?%hQ0^1Veb=NF$K;&{E+S9{%H7s{SWYbN@Wo3T1J2MM;SRe(D7Gmy+-gPD{uT#-(?l#;ZiD zlp8=gfoQ4z8pv`XAU_a~@Xd+A1-U!qo?FfU!XIsyP5=_y4o@2NAiaOq>RgBc{*NCm zbsK@S3$gD4Vu3j=tY?5Ajy|EE0@5sK{SHXIP!k_=J3^p-C!inTKCmdORxGP3uE3{I zSlvim_xb-0w1vw6!XGVjqkz~#rdQS0R4u7=NaF-MGa+*;B*XRX$*74I0a^p0145qm z0ud8_6o^Hb*##i=!ZLLN;Th8Q+6O=!f-jbWn&2m;mi+#Rc&A{<0>mL8!-4Pzw$vs` z_X4q?r{!Zdml2k=2FN_&q}m0<$t`Fx9t30;V*Cw|b~Nm+ptIM|J1qp{19DlFu>@uQ z&SivZ;Me#I$fCxo~NNRoh50I>*`*8({ml2NY- z>-cd%x6h>)@grzoXb|3{GeB%Y`mO=FESQYPCLAXq79iqvFb~L1THkJ-IT2i;P&0FY zoEEaS6iBlWhXaTwn0XA~*#g8%H`~o)p8{tP{J#i5((@)M@oi~BE z2)@4t(hf=PCEzI*|5*15(PRMWK_0YP7{z4-J5zwn6QY_0q);flGI|d&IDs4CO}o$T z2GSzfKL+Ho5W~wrY=Zp`Am4_L5EzvH%4LG{2+ZXZAU%Sef8_$|h7fE8C*0qR6bPoR zKy38vt7hkTaQi|NEnQQyqP7HEC4|6;GzBsqL4OtyT$uXQb0v@-p$s+vaRg%s1iJ?a zf3#(M&iP-^uYq*JnHK)*K=?n#wAImD;0&jZhV%zgCmf}Nfh-r0p91L=R-wPy`QyyY zhER7%sHnP1{juN?@=*#I?T#1tH39d6OdVwErM_i%5D3qMHv3mBQYL`D&@~IXLaINa zWf!f^+rXPc>BVQDqNGZa3Ivxi8K_x7cPNm~kQOXU;R}ks|;uV~|LlZBV?zDx1EUhU)ZDCnL2=9Hw^+36ES-RD__0qp1 bqKoE_t14NeUP>M#=hdSE&^oAdV&Z=Q6h<~Z delta 9831 zcmZ`;3tW^{+COJxU_g*j89;6`Fra{!hDx-)%Bi${E&PcsCYr{Of){Qhp`xaP8pb%H z1CN@yYIrLvw*|2l&2PiB#o9K}tzB!&#kLFDWpTIdv$AIY=bd3*PW$`bpXYs^^FPn+ zJkL4jJ%gLi4f^z*LEeV&h$U?cSvh0hH8uT0w{}6(2lwl?>F88yw!X*CSY}h|a9YGO zc^x(J>AZt3^HF>oh3iJ~`1Ty#XWV5P&sffdF2)&Sibo%dZm=_AVCTbI2aLRS3uC40 zCQh4EQwXIt47p7QiWu{-`p%m1$8|8)J17ya<#;I`({xC9hPjQs8$(q$(a_&8k=M+j z9U(^DI|+0+HRI-sVpJ|d)jiN6H#I5U%k50*ox#GUo+YWxJyH9aXPKHj5S#h6I zHk>x}60HhLGTb*vwdA6`VHw;_XTs9>a{4@M%x$v~>Hmr(dqOu{=h5|-;QY8*-KTm9yti~*wD}3xgX)Ga zGclW)LPxD@?;JX9NRJfB>QW_ov*}-kG(Lf1!|%DbcLVGyjVAkO)$5dTuE>t8`C)>fW~}-;;|bPx9Mft8Ij6=NhcyE z;r)F?X4;(DOsu}p)6wS1n5h0f^hL(5EJZM0#g}o7CJ)ZyE~*@y$}7k_I4=9sCBjKf zy2WQY0rqb98K3Dm821}K(|Ix0n3taE?(&&Fr1OJsG4#d*a+|JEWaQ+Oyh5?EN>vNV z6W~i}oOy9dPN(92-)EXdm62(#NQfxzf^-{(dKGtGx+UjL(MNS=Ui6ugRbBlhNC|xW zJXKu(`?=8S2oGVMYQ5e1Ljv&Vhr|nOQ~JOT_p{f1rpt=~Hb(t(lnCYhp#r33Jgxr^Du|xSPt)G$IQ|=YC0gO7VaI3MR3ajYN*qZ)7$>IWsFjJ@pMmmv3epXEp2@cO z-qZdQpqyq5&Eg-^>Y)knxntqCVHCW>^OAqFuujzNG!{!xFe@g%x(XrW_V#dv#H2 zh@;zw#k|hrS__2wvJ9pEs~QU;KbtCI*g;>IGNauy89R=B3rEELi+Q{BBj zQ@n%r#%|<=?HO?!d1@2P_)IU(gK1Cl0(6x6zt-HMc*bTvBA`3l=>DZ3FseW&{m%c8Lfa85jojaVn93mrGce5M2bg*=x|jmQXlNQFA+s}a`3 zF)F_W!(Y6sE*ww3QJkx8(?4l+LMp#V(-JZgk3Q%x^Lp6y=ntZYlXTgKI4Ql`U#N!J{p>jShJ zl*XA0a!$lYTK&u1v!2rF7{$#dQxTi6OWCl)m_gUph{c-_$#e?NGH69c9 z{6BqP#?^;}(|&zl#!lYzrIc^kNru#W_=EI7YOdvr&vAHakJw@2xoonF z95XxZOD&?FG<$QJ5#QgTX+<};jP?(y<9Kxj`rQHA^Rw~3(e3-wbh_lc;z#lQ^*{Dy zc9n5B{nXZeIeh~k@%BZZFAD8(w9RO{(T<>8o(=mtlaOI zBKKQ<*6*a$%)bqFrpZzk8k+SQZ>95DHtJ5b5YMi1Z89-d>tIaKLugNc7xXfk7rdZ8 zwB6usvAD6I9R}|N{WDrC_#RLn+DY&%j>TTR^`>J1b;R>+5J29n8hp z2*z$g>&1W#^Z;5P_*T$%v>V_%L3sici(wQr3C#fBBKSncA_Wg>MN0>71HBb36TBUC zGTIpM`Jl#n6hhe!It4A}(e_kZC2t;Q%ke^t!`-nM#EB*nBxraD zXCe1s$ppqf0d_--Q}H;Z{pE2F3~I7P9=$m;LdW8W7srO%M%ZBn4_!{Tv^(y2YEZM? z$XnZo+I>8tHQTO^eVpB%aLCGSkhKvD~4`BFz2k9jRJR!zwNMV%)9!Fq%j`Er#~x&Ilbp-M+4R)}YXe;>DH7#-(Lx`k%s4bOdD9 z#YIqMMas0IqMG@oMK-ocFS2i8FoLHz0$Wu=nt)smBI9aGYHJ{uuOf^M;=e&}Fco`D z)VFjTeYQNEKTk92N9bx9alR(B*vBO_S*BR=M94W)|F7f5& z_@W~JoO`6PYZ2sJ6@yyVuPWn*>Dnr*ZZ{)ueIlK!595EM+g6KE=B+N{pVONv{}uTE zquGy}Lw|%P7DoA-6UadZi0ym445f@(W5qjX%`do~R)ROu9`$`{O&LFfQM+n7nU<|J z>jw`OD`wA{#3oyaJ`J5#y1drRZ>NveTBprJpBVCQ6h^rTV#+6cP%e^(}|4*cU+S)va05PHh{$Nntnnfkm z)s`UA@4hpXOGwYM2E+{RaEhEtIpd zOqb4S$eJ|VVoz~%k-Jp@p@`oA5T7K7cQeHKG+~4KGxIVR3I1G3`ebi8f<7TQG3mGGDRq0OAN5Y(qn%ri6 z5;)vDHzrZ?iZFf$z3;a2MRe{-D{rUNO;%k`ba1h3-jvSIQrjkT=olzrK&@Gb<39B2 zh7OExE)YeEuMCJIY+%I81R}|}fH;Ts+v%?i{1kYW@CEdmN1TD8vQ7%yY~>%)=*?#R z4q=9-Z#KJL0mrZ`wWOQ@(u19)As2vj;|roK?SBC2m1J~7PzGF1G?_FYeL{E(kdZ;2VxOdrr@dYuPi_g2{Pj6Bg6g4FVvqYM7wwE5`K)ry;lA%jm0~T zW_Zo~W?BmVF4~TF9v%0N!Z~%>yO0;s)FvxmNELWjQ&ZC@K8lVvS*gbxL7z1}0=+5C zLT@qNh17_59MKu;c)tV`&imbitc&>^=!YDlC~*0B8s<Mh}B^-iub^0D{OQoV!b3# z?K81=w5#3z5(&WzK)P{>6-D!(JKqjKbit1cjJ);C5*|X=_Kp>28~={hw3u}{MtWp# z3QkAeokr>_PZ5_8T~8uiZCS!2X~wZc@{TfK&mvYHPJ8y5^>YwoA7-U~4olFn_g`Lg zeTfvYe+ddA^ql*~;FINROQe)G1NH1r*RdpZH&wPN-3=eI4Y=4=Pw+zP5DU zFZT<&_fQ4QwH*@m719fy74;R|$KWzm&hearyMe$ift#pua}O)jaUhpIIIM6*MGBu+ zaGvgaehrO#HkS%sQ0NHg1<>s0aw-2sg${$h13L0>F6A9j=pg7@plQ$NlJaYXT0nmf zn({&}O@2wC-Jq|7CcKzS_TMP96ZChWu}5<0j#h=Xfu3kp@P`=n2d*uCttucBgP9Os8)8QJe<1m1Ur}6+D<9?|xql97hv|HW z+4U;8Oer&6Kx`6nQOLlwwky5{A|7$M@dqM)8jGB3GPmQ>a#0FxCXfzk9o4!3+m|ze_zmB<{YrGYy1B0_ub(P3R8#*Ga2O z0dAARS_Gs{3Vj(6VNDCG5eU2v2z?I_hosde5NQdV6LzFPuet!;fO~%p9$UPyvbY>( zrDFaYGEV6{jKob|JX+>bfY^ejAFHXZoL}K&*Mm2HAw3bj>p>ZTJdl7reprGYh0ty( zPc9&G!nXin(#&20QYV$^RUjfm+SYmph*R?QWdi;p+zK`PQyQHa6A+=P zZGg+@)k>@32O#;9Rw%}Ix+KU1Xfjr)wn)=~U>XBLybVaN6yj7M@e(o%h()rz07yqr zM!glR61$&_ohd~dFt{@~2yg5V5Tmp!P69bAnfwvRLlP$-yZ?#grw%_dmyb+G?DmwbSq}9t%VdIPRY(qKnkU(?gS#fquT12N!Jj=5`n{` zc70s|WRYZlE0D8N4EurDB>P8!d=orEV355jWTd&g2c%E3^I0aKP6)wPAhkaUL^3_Z zj1cM7*UhdBaD~B%maeE?TvLKI7DQl#-2@r0q<<$6aU0Usb0Ls!X&Ed8;ta$flF!&0 zAmY)=xZU+%(6c~V;Ymt6x8kq2$|2Q4fOz(DAv1zjoC z=V|2`tLqBzx?p-C?QGH*h6DUe}SS^ zDoO}Smhm8nprUy2q6GBPOR-Rj7ok_ZwNSx>e}Ed_n@LuR58j*4e82nl$IR@@9;?qc ze%}KWPgH<0%hwV7iIZ0h;FMG75U>V{>KEk4)(b-&L>RZ$jUd5u1z@vzncw=|>H3Po z4V8DX2;1aI*6WI*dr##h7751?AK^nN@b-`hj3h3Yl`V7WhtA)#$g!Haw5nhI)Y7); zLi1s0nTD#5W>Tt#h|S81m~KC9G#Y$^-F4Sm!ABjhqtoTd(yTsFzCNW77Zzsba=CK0 zl)nb4Z0->CQ}ADoI1ek{<1{%)1%t+EOmB0n;}}tW4rYE(hb|B+b%6gTH1ZKeZaP9jiej1 zDQ>$6!le@da2`|AX#KOZptwl<=;DX92wUZsG=qKPx3un|sqAElEZQpuIyfMcnaxjR z`o+$Xf(H?!cbD9^f67Hv*7&;CsnY%h_;; a=5oALSP+MLp8xUeod98(9OT*Qc?f=DpX z@^ShDO56lS;(%?2HbD@yn17&E1T9*%Xjk+-=Z-I;1Lxe&`=0aeJ@;_KfxQbIi#1=d zHH}iUVMlM*AwKrCQlA{rRU#a`!-z6|0yfC)baT?|7g8O48W$?(@1cM-yop>sN; zAJMqJ=pI057+TetbOZRIRgCS`Sm(^x+~l*blTW{=zVQxppflvfcIkO+-xSLWSLnWT zm0mbzaFo+9UgzM+)*52%gY)_Zex8{=JCz*|bPH}&C*pOXUc{S1XAz4+0b)TYi#R1T zftVNK%x$5yNZSNWi&jIN5kgSc;113c+5xr$$3^6JZJL|0bSld71+2zxSxQA&zLM1j zBDxf10g~l;Ds=~LN#Ctge93VimseIX*x&6L{g%>R;5A*TR33$X56ydKs#K~zTrTBg zwpyjoINRwqJL$hl0SeFADwnHE8&#>aM>?A4pP=_%MZcn~ALtxS`}VmcY26>z59qZY z^sHbPHhyz4p)LC22P5xVx Date: Sun, 16 Feb 2025 11:20:25 +0600 Subject: [PATCH 2/3] resolving conflict --- lab1.cpp | 2 +- lab1.exe | Bin 59276 -> 59276 bytes lab1.o | Bin 5137 -> 5137 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/lab1.cpp b/lab1.cpp index 4bb28ba..e078f64 100644 --- a/lab1.cpp +++ b/lab1.cpp @@ -7,6 +7,6 @@ void newprint(){ } int main(){ - cout<<"Lab2"< Date: Sat, 22 Feb 2025 22:03:54 +0600 Subject: [PATCH 3/3] trying to resolve merge conflict --- lab1.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lab1.cpp b/lab1.cpp index e078f64..2fe647c 100644 --- a/lab1.cpp +++ b/lab1.cpp @@ -2,7 +2,7 @@ using namespace std; void newprint(){ - cout<<"print from Newsubbranch"<