merge conflicts

Ming-Yan · Apr 2, 2024 · d9be729 · d9be729
2 parents 5221d06 + 70f87f1
commit d9be729
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/BTVNanoCommissioning/utils/correction.py b/src/BTVNanoCommissioning/utils/correction.py
@@ -449,7 +449,7 @@ def add_jec_variables(jets, event_rho):
 
 
 ## JERC
-def JME_shifts(
+def JME_shifts(  # _factory(
     shifts,
     correct_map,
     events,