From 8d5e782ccf220d77f0aad5a4e5605dc5cbe0f410 Mon Sep 17 00:00:00 2001
From: Garret Fick <garret@ficksworkshop.com>
Date: Sat, 6 Aug 2016 09:51:58 +0800
Subject: Fix multiple problems with the merge. There are still errors, but I
 will intentionally leave them because future merges might resolve them

---
 gerber/render/cairo_backend.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gerber/render/cairo_backend.py')

diff --git a/gerber/render/cairo_backend.py b/gerber/render/cairo_backend.py
index 349640a..dc39607 100644
--- a/gerber/render/cairo_backend.py
+++ b/gerber/render/cairo_backend.py
@@ -21,7 +21,7 @@ except ImportError:
     import cairocffi as cairo
     
 import math
-from operator import mul, di
+from operator import mul, div
 
 import tempfile
 
-- 
cgit