resolved conflicts

camera/camera.py

@@ -438,12 +438,6 @@ class Camera(object):
         ]
 
         out_a = src_a + dst_a*(1.0-src_a)
-<<<<<<< HEAD
-        out_rgb = fdiv(
-            src_rgb*src_a[..., None] + \
-            dst_rgb*dst_a[..., None]*(1.0-src_a[..., None]),
-            out_a[..., None]
-=======
 
         # When the output alpha is 0 for full transparency, 
         # we have a choice over what RGB value to use in our
@@ -453,7 +447,6 @@ class Camera(object):
             dst_rgb*dst_a[..., None]*(1.0-src_a[..., None]),
             out_a[..., None],
             zero_over_zero_value = 0
->>>>>>> master
         )
 
         self.pixel_array[..., :3] = out_rgb*self.rgb_max_val

helpers.py

@@ -693,11 +693,6 @@ class DictAsObject(object):
     def __init__(self, dict):
          self.__dict__ = dict
 
-# Just to have a less heavyweight name for this extremely common operation
-<<<<<<< HEAD
-def fdiv(a, b):
-    return np.true_divide(a,b)
-=======
 #
 # We may wish to have more fine-grained control over division by zero behavior
 # in the future (separate specifiable values for 0/0 and x/0 with x != 0),
@@ -711,7 +706,7 @@ def fdiv(a, b, zero_over_zero_value = None):
         where = True
 
     return np.true_divide(a, b, out = out, where = where)
->>>>>>> master
+
 
 def add_extension_if_not_present(file_name, extension):
     # This could conceivably be smarter about handling existing differing extensions