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/tests/test_primitives.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'gerber/tests/test_primitives.py')

diff --git a/gerber/tests/test_primitives.py b/gerber/tests/test_primitives.py
index 261e6ef..e23d5f4 100644
--- a/gerber/tests/test_primitives.py
+++ b/gerber/tests/test_primitives.py
@@ -10,15 +10,13 @@ from .tests import *
 
 def test_primitive_smoketest():
     p = Primitive()
-<<<<<<< HEAD
     try:
         p.bounding_box
         assert_false(True, 'should have thrown the exception')
     except NotImplementedError: 
         pass
-=======
     #assert_raises(NotImplementedError, p.bounding_box)
->>>>>>> 5476da8... Fix a bunch of rendering bugs.
+
     p.to_metric()
     p.to_inch()
     try:
-- 
cgit