From 42ffa3a24e9298f8e9d0478e98e9e9cdf562a832 Mon Sep 17 00:00:00 2001
From: Gary Bernstein <garyb@physics.upenn.edu>
Date: Tue, 28 Mar 2017 11:42:18 -0400
Subject: [PATCH] Finish merge of some changes

---
 Match.cpp    | 2 --
 configure.py | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/Match.cpp b/Match.cpp
index 3670739..ca4406e 100644
--- a/Match.cpp
+++ b/Match.cpp
@@ -506,8 +506,6 @@ CoordAlign::fitOnce(bool reportToCerr, bool inPlace) {
     Stopwatch timer;
     timer.start();
     (*this)(p, oldChisq, beta, alpha);
-    /**/cerr << "Beta\n" << beta << endl;
-    /**/cerr << "Alpha\n" << alpha << endl;
     timer.stop();
     if (reportToCerr) cerr << "..fitOnce alpha time " << timer << endl;
     timer.reset();
diff --git a/configure.py b/configure.py
index 91f9e80..6199ad8 100755
--- a/configure.py
+++ b/configure.py
@@ -632,10 +632,6 @@ def variableSubstitution(d):
                            (expoAttr['exptime']!=None and \
                             abs(expoAttr['exptime']/e.exptime-1.)>0.0002) or \
                            (expoAttr['mjd']!=None and abs(expoAttr['mjd'] - e.mjd)>0.0002) or \
-<<<<<<< HEAD
-=======
-                           (expoAttr['apcorr']!=None and abs(expoAttr['apcorr'] - e.apcorr)>0.02) or \
->>>>>>> 2c70e3737904183fca3466f79d16352ad6aa58d4
                            (expoAttr['coords']!=None
                             and getDegree(expoAttr['coords'].separation(e.coords)) > 1.):
                             print "ERROR: info mismatch at exposure",expo, "file",fitsname, \