From 39f8ccdb42bfc989d87e3b7d3a3207cec46d1d24 Mon Sep 17 00:00:00 2001
From: Joel Thomas Clemmer <=>
Date: Fri, 18 Feb 2022 15:33:26 -0700
Subject: [PATCH] Fixing an overlooked merge conflict

---
 src/MISC/pair_tracker.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/MISC/pair_tracker.h b/src/MISC/pair_tracker.h
index 0a015d6ec7..cf4fd11608 100644
--- a/src/MISC/pair_tracker.h
+++ b/src/MISC/pair_tracker.h
@@ -58,7 +58,6 @@ class PairTracker : public Pair {
   char *id_fix_store_local;
   class FixDummy *fix_dummy;
   class FixNeighHistory *fix_history;
-<<<<<<< HEAD
   class FixStoreLocal *fix_store_local;
 
   int **type_filter;
@@ -81,11 +80,6 @@ class PairTracker : public Pair {
   void pack_rave(int, int, int, double *);
 
   void process_data(int, int, double *);
-=======
-  class FixPairTracker *fix_pair_tracker;
-
-  void transfer_history(double *, double *) override;
->>>>>>> develop
   void allocate();
 };