tx258/lammps-gran-kokkos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing an overlooked merge conflict

Browse Source
This commit is contained in:
Joel Thomas Clemmer
2022-02-18 15:33:26 -07:00
parent 642b1e25f6
commit 39f8ccdb42
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/MISC/pair_tracker.h
View File

@ -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();
};