From 19d821106c2c65f4e4909c6e14e7257960ca1516 Mon Sep 17 00:00:00 2001
From: Will Boyd <wbinventor@gmail.com>
Date: Mon, 26 Oct 2015 09:37:59 -0400
Subject: [PATCH] Fixed merge conflict with Filter.merge(...) routine

---
 openmc/filter.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/openmc/filter.py b/openmc/filter.py
index 51c60caf86..8a5525233c 100644
--- a/openmc/filter.py
+++ b/openmc/filter.py
@@ -302,11 +302,7 @@ class Filter(object):
         merged_filter = copy.deepcopy(self)
 
         # Merge unique filter bins
-<<<<<<< HEAD
-        merged_bins = list(set(list(self.bins) + list(filter.bins)))
-=======
         merged_bins = list(set(np.concatenate((self.bins, filter.bins))))
->>>>>>> upstream/develop
         merged_filter.bins = merged_bins
         merged_filter.num_bins = len(merged_bins)