forgot the merge headers .,..

Author: spencer-gre

src/c/weaver/weave/perfflow_weave_common.hpp

@@ -50,7 +50,6 @@ class WeaveCommon
     bool instrumentCaliper(Module &m, Function &f);
 #endif                                                      
 
->>>>>>> upstream/main
 public:
     bool modifyAnnotatedFunctions(Module &m);