segundo commit

Entrega.md

@@ -555,6 +555,7 @@ for i in range(0,len(clase_estrella)):
 
 fig, axs = plt.subplots(2, 2, figsize=(6,6))
 
+<<<<<<< HEAD
 axs[0, 0].imshow(graficas[0], cmap='gray')
 axs[0, 0].set_title('Estrella 1')
 axs[0, 1].imshow(graficas[1], cmap='gray')
@@ -670,3 +671,5 @@ estrellas_para_estadistica = estrellas_recortadas(imagen_grisss, 230)
     [NbConvertApp] Making directory Entrega_files
     [NbConvertApp] Writing 13781 bytes to Entrega.md
 
+=======
+>>>>>>> 0f2da7af2bf4815482fe5f2f1fa9eb1e200e0f1f