From 9affe5a6de9096a0db8929f4a188d22881da17c3 Mon Sep 17 00:00:00 2001 From: Matheus Horstmann <horstmannmat@hotmail.com> Date: Sat, 12 Dec 2015 15:29:50 -0200 Subject: [PATCH] conflito --- Quadra.c | 4 ---- busca.o | Bin 2996 -> 3204 bytes libbusca.a | Bin 3252 -> 3552 bytes 3 files changed, 4 deletions(-) diff --git a/Quadra.c b/Quadra.c index 52fbf81..f8da7f6 100644 --- a/Quadra.c +++ b/Quadra.c @@ -34,10 +34,6 @@ void jogar (int *vet, int *vet_ord, int N) { scanf ("%d", &x); fprintf(log,"%d, ", x); -<<<<<<< HEAD - // fprintf(log -======= ->>>>>>> 5a74a3d7df2951a51ce7542d1e9b976ac579a82c if ((pesqseq(vet, x, N) != 0) || (pesqbin(vet_ord, x, N) != 0)) i++; } diff --git a/busca.o b/busca.o index 4966c7712a2bf058db8ca485324678a2cce145a3..152847d8f1d2edc9ebf4733511b200756d6bd3ba 100644 GIT binary patch literal 3204 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 C-leku literal 2996 zcmb<-^>JflWMqH=Mh0dE1doB?2s=c^1Wai#@Gx*Pgmyk{ek0KB%F!Ll(<#vHD$wcr z=QT@n?jOc(*FU`?tste{t{jXPx*4opc}kykyZ$+O7^3O8>lcveU_C#&U4L|keqp@O zdFbFPdBzJDe{{P3!D<3)x9gwR-q@t-xVv5dG{0c%bp7#~6U02g*y;KOyTM<qU4PWf z-vM$R%sJhzJlzbaE(W`Sr<<V}WYUk<X5FqoP!(9a{;8G05QS<B{n07V?D~VT+x3UF zt3cf$s6{fzU4MZ5{W`bX^#|C2Je@8o9KEhzI$cy)x?MRsSyW#9`Tzevc5{(kaH!k$ zOD_*Rj8AkkbTWa25W#+^+x1T;6WkR%b=^=`2po6)!o<M9@Nyml14FkfPp9jTm(5@% zvIQ5q1-e~-u>Sx5-yYQ-%R{vxM7a-}W{@MH;utQ?g@)G`{@%j>|Nl3;eqro({bKFP z!`~P7|NnoO>$_bAx<h$TlFNr~S02>Z0SB%Cy4a6y*AM7of53M9sFw%Rf9i$0UH@3S z{-|f|cKz^Lz1vmbwNke$&udw5RKldcK%_Z9GR)ns0#LW<fD*Ke3P>0&Lc#9&f^PQ@ zj2PoV4Qo(vA^YqQDBUoD<LnK{F4qq)CowQEyk=>3eZ$!8`UcekkT*EGUEf%{3e?;K z<;)L^7y$rM^9-!!L#-Ev3E<?6Z0aG90T{^+IZz?V4q_sIPZBsWqj}*2rYF%%_yO{` zNO$OmPFT=tbi49cy9(4sKr#yt$oE)7y4&>&s35>4*BihH)!G??lI5ULXwmJ;bMOHZ zEF*ThzCagv)9w1=IJj`^c6|db`i{Fk0hJ~%H-R(J6L=)N02O_mt{=Kx5n^v3Vqcnb zpMWC6+Vx9qU9andP8SuPZg4Tc(e3&HE%7wFg480+c)<vY22c<o#6aeTK4^Z$2r78c zm0#!%eb9V}5mZPc>j0G@olMQOPZ;<+UBEev!QI)}N<kwusWh*oRKY~gLeE6ks1(dI ztTQyxGceJFh=Tkp0wNd~7#OR97#M3f7^QhwSUMOP7-SeA7$j{9A{_ZRTA7@9SqqQy zu&_YnY#10AKyv-a@=V=e1t9$~3=9lM7#J8bQRGwM@-++$47!XA3~ea#O>p@+3=9mL z85tP%p~&xo%kN=eU?^l_U;wFOfVq!p23-CQ0|NsuGXq03sJMp7Glw&R6oB0Khk=11 zgN1=11I7FlkTk^qj0_AHSQr?Xk@YkE2g@_)6<6k#BqlNF6_*r2=nNREC^bi~B(<W1 zK`$k-B#}WcskoRyFF8LqH#M(>K`$@ABvsGdFI2a<Br!RgK@X%lH6uQ)C^0t`<PhSp zJSff>7#P@~%0YGdWmYH$DhJ|8GcYi4f*4S&!_C0pz`(%31y#esz`(%4z`&pi<ugOo zvBM08@<BlWVroOx6H;dYH4j9C^nuLN0x_T%WF81xLe)Wq84PjQ>kCx}s`Ef<P1qP1 zEI<Z;I1CI7Ab)_Eo@oBf;bvg)fclpmst)8|K?Vi}m>)p;a@ZLd!a)ouh8Yc_VRnL~ zmT)pKC@?ZGa6`iZWUm0!PGs|ra6!`*NE6iUP$mimG9M<u!tn7wj18huTW=uuBHIAs zgKP(>gkWZPYJl-UK8CPCBr^jmJS~9otq=nv11KCoY)~Es@g<S+EQk+EXRtg9;)CK4 zmM1}ckX~3G1o3T=@*IfohLp!Z{1662o&xa`K@NjrP&hIql@=!_>LoK2q!t$zrxt?g zq|7{q+|<1MB8K49oYdr!;QXQz2B*@bq?}YRGdDFQGchlbAt14+Br`cNpCPa`GdUY1 z6<?H^jKs?<VaQF)$;nS<2xnwqVB%t6&|qd@VB%$9n8d=sz{JPEunt7?GccTj(hoqi uAOpikD4og*QK!Jbz`(==$x9$Q0m^TH(hH#U0Vw?dN`vYgka|!W0?`1_$m$pX diff --git a/libbusca.a b/libbusca.a index fcb69dc691f74e4b718c8359085470ee5b3ab624..2c7c4c5a1f7bb3c9315d63d722797f7e38e878e0 100644 GIT binary patch literal 3552 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 SelkX{2iDVJVBq57;sO8(Ch2Mb literal 3252 zcmY$iNi0gvu;bEKKm~>-CYF{a2F7OQ3JL~bDP&SX!O+M8EUKW8z{SA8z{$YCaD)&p zNG&cbPAy~r(Mg$k47sU!`9%!DsX3|1CBgYcB@9lbNl7`WU}kP=N@ikSB11r8QAuWU zVm?D)X=ZXZNGiT4H5rMQS;CN1TAZAymk;*>vfB*}3=9+$;G~&}iGqTWrKK6f@d;e@ zu0C#zjEoF0z{tSNfZ#DO9ASsZn1Cq_1|9}ZhS1KZ&2I#{T{*f#c{&BUT?IN_|GZ{t z&i%vK?fR!zq!pyJ+m(ayLN|l8D^KaOZr4924?{E^cl`n~9jxa^x9gAY&@YS^Iu9Lu zCC_-_;*U<(KUhs*?RNe1+8dix9e20upXL{govuG#bAp%$7&~3RU^n=Swd;?X`8z<a zgE^<$m8Y8l)x}^p@N_dYgG~DI+N|642dV;V*FUu~7@|;Zp+7nWnq7Y|cDw$tb`_{Q z1hq)!xa$v)zhCEeyZ!(>kf+l{g`?N?OQ(wpOSdaWCyUC9KmY&#$8IjN3l4R=e(B|b zhw+JShE67s5F*$Qb-VuQWP-bbr>-073W4LUUzive7+%g}U|{HW<>_?&@v<4rM7H2U zw?Mb+57z(x|J$S5V|l1Hgedo6(+qMXR2;*lxzO<X!rxo?|NsAH*Ds9Su3xNOdHDOn z{{R0EbA7j~KzAq)N^<$o?aG51JK(?-Ko|Sb?fL;-><`$EANBHJ`cJ)3x9cBk*B|w) z-L4;At9QE!yjJRV<#{a&j!KyH7l<?mNQSxFRRHQX9Z-UHQ2_~~MJU)kU(oITfe~Xo zs9_BXE@Yn_0;L-!aGbpX+2#7-<s=3MhSx03u5TE-UEiQu0P+S$x9b~gSAm*)pq%-E z5hDOVYMz1Be5m!pFaeyLkxe}WG5{mlAqOfX*+ER??@0nDW;8E+!1N@V2|qv{7wHcD z&<P7#jc!*SYgd8V2uNn(0r?(lNO!w_0Tl$e<az@bp;|jbP_i5}3N5-_c@92cf@Q=` z*B9slZ@OJy90wPU-L7xIMc;APC!o^g<tA_@dIFDx7oeiA)Ad8QD?;oIMC?m*?h{aC zSi63yt?PAt(CMPW(+w^LIJ#Xwpe3GWSCCqS87~+?(Eth}gc!)&&<D-07(oROy7CL% zp%0o5F@g$dWF4R~q?4(+_6Y-jrwcfTF}OQBTPbLSCY9!ulq#6$S?HPQ8kK^1hINJ} zdIlz%5K)kSML+}t0|R4K5CdZk2ct9(3rhzh1A`0$1cRhaL4+e8M=O&PFKgjZ9u^je zoDBm514ynPS)QpItN^4x23m<`qR6Mh<!cxi7<3sK7}`+eo8a<u7#J8fGcqvjLy_MF zm*2y{z);A<zyMOm0COMH47mIq1_lORW(J06P;m{DXAWlsDFC_e4+8^31`7j228#J9 zAZdvI85tNZurM$%BkO1S50+=pE3V8fNlaqUD=sO5&>1jRQEHA}Noqw2gI-EvNg{(@ zQgJbZUUGhJZfaf$gI->KNvfW^U#M<zNn&y~gC0nAYDRooQDSZ?$RWgGc~G1&Ffgz| zm4oW^%dAiiR1U<GhBjzGY!KGrW?*n&U|;|>bU@x>VPIh3U|?WSh3a7jDPmw?V22qD z<%86MnA%YFgwz>8%>&UOeIWC+Kny4bnFqp_P<2pY216Y7`a;!#>O7EI6E+403y=XI z4g&)N$R8l4Cz^kAxEUBcp#Eitsss5~kb!{#<_D0z9CikVa1aBEVMc>!n4KW0C7cWl z3XBX4+|Y0U*((6G6WP2YT+nm{(gbxol!-!t%!diEFns(EV}oea)*HyZ$TooZAlpGI zA($DS8en{ok0ERj$;`kCZrp;{pnNODz{mg!2M`;She3Qvq&y4agVGr+kAnE1IE3X% z5Fex$mIpz6TckV(;=3W`F%Un50g<Ob{6vsrpcoX6&<1caxM59;26k>@PELL@LpUP? z0}~emg9bAL0~0R;!z3041|~iRhIJsCpMl{NlzsrB1sNDVLg`dih&lxZ1_mZ3NL~Wb b2~d6mlwJU(4?yV$P#RR{fYgK15Qqi<2)!s8 -- GitLab