Fix rebase error

DDDigi/io/DigiIO.h

@@ -75,12 +75,6 @@ namespace dd4hep {
       template <typename FIRST, typename SECOND> static
       void _to_edm4hep(const FIRST& first, SECOND& second, int hit_type);
 
-      template <typename FIRST, typename SECOND> static
-      void _to_edm4hep(const FIRST& first, SECOND& second, int hit_type);
-
-      template <typename FIRST, typename SECOND, typename THIRD> static
-      void _to_edm4hep(const FIRST& first, const SECOND& second, THIRD& third, int hit_type);
-
       template <typename FIRST, typename SECOND, typename THIRD> static
       void _to_edm4hep(const FIRST& first, const SECOND& second, THIRD& third, int hit_type);
 

examples/DDDigi/scripts/TestEdm4hepOutput.py

@@ -17,7 +17,7 @@ def run():
   digi = DigiTest.Test(geometry=None)
   read = digi.input_action('DigiDDG4ROOT/SignalReader', mask=0x0, input=[digi.next_input()])
   dump = digi.event_action('DigiStoreDump/StoreDump', parallel=False)
-  writ = digi.output_action('Digi2edm4hepWriter/Writer',
+  writ = digi.output_action('Digi2edm4hepOutput/Writer',
                             parallel=True,
                             input_mask=0x0,
                             input_segment='input',