summaryrefslogtreecommitdiff
path: root/crop-thirds.py
diff options
context:
space:
mode:
Diffstat (limited to 'crop-thirds.py')
-rw-r--r--crop-thirds.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/crop-thirds.py b/crop-thirds.py
index f0bcf18..996ce54 100644
--- a/crop-thirds.py
+++ b/crop-thirds.py
@@ -79,11 +79,6 @@ def build_thumbnail(i, fn):
if (i % 100) == 0:
print("{}...".format(i))
-<<<<<<< HEAD
- canvas = Image.new('RGB', (int(src_width + dst_width + x_margin), src_height,))
-=======
- # canvas = Image.new('RGB', (int(src_width + dst_width + margin), src_height,))
->>>>>>> 455c3fef555b6f556321c2db6a8dc355154666da
image = Image.open(fn)
for n, path in enumerate(paths):