resolve conflicts

2020-07-07 11:46:05 -06:00
parent 955bff7c4e 7e140399db
commit 88fc9360c0
4 changed files with 360 additions and 15 deletions
--- a/src/atom_vec_hybrid.cpp
+++ b/src/atom_vec_hybrid.cpp
@ -472,6 +472,7 @@ int AtomVecHybrid::pack_data_bonus(double *buf, int flag)
    
    return styles[k]->pack_data_bonus(buf,flag);
  }
+  return 0;
 }

 /* ----------------------------------------------------------------------