merge conflicts.

qxhy123 · Feb 1, 2018 · 44d2088 · 44d2088
1 parent df38ac3
commit 44d2088
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/utils.py b/lib/utils.py
@@ -1,8 +1,8 @@
 import argparse
+import sys
 
 from pathlib import Path
 from scandir import scandir
-import sys
 
 image_extensions = [".jpg", ".jpeg", ".png"]
 
@@ -48,4 +48,4 @@ def iterator(self):
             next_item = self.queue.get()
             if next_item is None:
                 break
-            yield next_item
+            yield next_item