...

Signed-off-by: Cristopher <clm15@inf.ufpr.br>

Quadra.c

@@ -34,7 +34,10 @@ void jogar (int *vet, int *vet_ord, int N)
     {
         scanf ("%d", &x);
         fprintf(log,"%d, ", x);
+<<<<<<< HEAD
         // fprintf(log
+=======
+>>>>>>> 9affe5a6de9096a0db8929f4a188d22881da17c3
         if ((pesqseq(vet, x, N) != 0) || (pesqbin(vet_ord, x, N) != 0))
             i++;
     }