From 47c41139bfe7d47e9b453baf8e0cc58ee470ca89 Mon Sep 17 00:00:00 2001
From: Grant Sanderson <grantsanderson7@gmail.com>
Date: Tue, 23 Jan 2018 12:23:29 -0800
Subject: [PATCH] Final merge conflict cleanup

---
 scene/scene.py     | 5 +++++
 topics/geometry.py | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scene/scene.py b/scene/scene.py
index fb4ba6ca..34aef3cc 100644
--- a/scene/scene.py
+++ b/scene/scene.py
@@ -482,6 +482,11 @@ class Scene(object):
 
     def preview(self):
         TkSceneRoot(self)
+    
+    def save_image(self, name = None, mode = "RGB", dont_update = False):
+        folder = "images"
+        if dont_update:
+            folder = str(self)
 
     def get_image_file_path(self, name = None, dont_update = False):
         folder = "images"
diff --git a/topics/geometry.py b/topics/geometry.py
index 0ef70f20..4ed297b3 100644
--- a/topics/geometry.py
+++ b/topics/geometry.py
@@ -172,16 +172,11 @@ class AnnularSector(VMobject):
         arc_center = first_point - self.inner_radius * radial_unit_vector
         return arc_center
 
-<<<<<<< HEAD
     def move_arc_center_to(self,point):
         v = point - self.get_arc_center()
         self.shift(v)
         return self
 
-
-
-=======
->>>>>>> master
 class Sector(AnnularSector):
 
     CONFIG = {