From e35cb23aa8e877ddfd905eea304139be9763aacc Mon Sep 17 00:00:00 2001
From: Matthew Hoopes <hoopes@rhiza.com>
Date: Wed, 1 Apr 2015 09:57:45 -0400
Subject: [PATCH] forgotten conflict

---
 pptx/shapes/shapetree.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pptx/shapes/shapetree.py b/pptx/shapes/shapetree.py
index 0bbbfd978..55b0ad291 100644
--- a/pptx/shapes/shapetree.py
+++ b/pptx/shapes/shapetree.py
@@ -322,7 +322,6 @@ def _add_textbox_sp(self, x, y, cx, cy):
         sp = self._spTree.add_textbox(id_, name, x, y, cx, cy)
         return sp
 
-<<<<<<< HEAD
     def _add_cust_geom_sp(self, x, y, cx, cy):
         """
         Return a newly-added custom geometry ``<p:sp>`` element
@@ -332,8 +331,6 @@ def _add_cust_geom_sp(self, x, y, cx, cy):
         sp = self._spTree.add_custom_geometry(id_, name, x, y, cx, cy)
         return sp
 
-=======
->>>>>>> 394152de810b94004991b9b0f0dc59af0ba112ea
     def _add_groupshape_sp(self, x, y, cx, cy):
         """