Update app.py

app.py

@@ -26,7 +26,7 @@ def GIF(fname,pixel_size):
         frame = Image.fromarray(frame)
         frame = cv2.cvtColor(np.asarray(face2paint(model, frame)), cv2.COLOR_BGR2RGB)
     frames = []
-<<<<<<< HEAD
+
     for frame in result:          #Third Step: Combining the frames into a GIF
       frame = cv2.cvtColor(frame, cv2.COLOR_BGR2RGB)
       frame = Image.fromarray(frame)    
@@ -34,7 +34,7 @@ def GIF(fname,pixel_size):
     frames[0].save('cache.gif', append_images=frames, save_all=True, loop=1)
     cache = Image.open('cache.gif')
     return cache
-=======
+
     for frame in result:
         
         frame = cv2.cvtColor(frame, cv2.COLOR_BGR2RGB)
@@ -43,7 +43,6 @@ def GIF(fname,pixel_size):
     print(type(frames), len(frames), type(frames[0]), frames[0].size)
     frames[0].save('cache.gif', append_images=frames, save_all=True, loop=1)
     return Image.open('cache.gif')
->>>>>>> a2e31df8118400de0782a9feb55255620b93cd83
 
 def initilize(image,pixel_size,checkbox1):
     if image.name.endswith('.gif'):