fix merge artifact

This commit is contained in:
Axel Kohlmeyer
2020-07-20 20:40:02 -04:00
parent 5b4275002c
commit cac4c5d930

View File

@ -24,7 +24,6 @@ class Variable : protected Pointers {
public:
Variable(class LAMMPS *);
~Variable();
void set(const std::string &);
void set(int, char **);
void set(const std::string &);
void set(char *, int, char **);