fixing merge conflict with dev

1 files changed, 3 insertions, 1 deletions

diff --git a/Source/WarpX.cpp b/Source/WarpX.cpp
index ed60fc06c..49f8b5eaa 100644
--- a/Source/WarpX.cpp
+++ b/Source/WarpX.cpp
@@ -27,6 +27,7 @@ using namespace amrex;
 Vector<Real> WarpX::E_external_grid(3, 0.0);
 Vector<Real> WarpX::B_external_grid(3, 0.0);
 
+std::string WarpX::authors = "";
 std::string WarpX::B_ext_grid_s = "default";
 std::string WarpX::E_ext_grid_s = "default";
 
@@ -301,6 +302,7 @@ WarpX::ReadParameters ()
         ParmParse pp;// Traditionally, max_step and stop_time do not have prefix.
         pp.query("max_step", max_step);
         pp.query("stop_time", stop_time);
+        pp.query("authors", authors);
     }
 
     {
@@ -1297,7 +1299,7 @@ WarpX::Version ()
 std::string
 WarpX::PicsarVersion ()
 {
-#ifdef WARPX_GIT_VERSION
+#ifdef PICSAR_GIT_VERSION
     return std::string(PICSAR_GIT_VERSION);
 #else
     return std::string("Unknown");