From cac4c5d9304be6634f1780dc396b4e0795b52aaa Mon Sep 17 00:00:00 2001
From: Axel Kohlmeyer <akohlmey@gmail.com>
Date: Mon, 20 Jul 2020 20:40:02 -0400
Subject: [PATCH] fix merge artifact

---
 src/variable.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/variable.h b/src/variable.h
index 75c5814f1f..f5ea11c0b4 100644
--- a/src/variable.h
+++ b/src/variable.h
@@ -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 **);