From ae0687d7f15f56d4490b6e0b0104d7a6f805a9bb Mon Sep 17 00:00:00 2001
From: Florian Festi <ffesti@redhat.com>
Date: Sun, 17 Apr 2016 17:43:16 +0200
Subject: [PATCH] Fix rebase mixup

---
 boxes/edges.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/boxes/edges.py b/boxes/edges.py
index e985021..94262be 100644
--- a/boxes/edges.py
+++ b/boxes/edges.py
@@ -20,7 +20,8 @@ import inspect
 
 def getDescriptions():
     return {edge.char : edge.description for edge in globals().values()
-            if inspect.isclass(edge) and issubclass(edge, Edge) and edge.char}
+            if inspect.isclass(edge) and issubclass(edge, BaseEdge)
+            and edge.char}
 
 class BoltPolicy:
     """Abstract class
@@ -184,7 +185,7 @@ class BaseEdge:
         """Space the edge needs outside of the inner space of the part"""
         return self.width() + self.margin()
 
-class Edge:
+class Edge(BaseEdge):
     """Straight edge"""
     char = 'e'
     description = "Straight Edge"