clean diff

Former-commit-id: d0a45993124e799a142aa4d3a0f2ab52a3fbe358

core/processor.py

@@ -212,7 +212,6 @@ class PostProcessor:
                 else:
                     raise ("Outpath not defined", type(dataset))
 
-<<<<<<< HEAD
                 if isinstance(result, dict):  # Multiple Signals as output
                     for k, v in result:
                         self.write_result(
@@ -225,18 +224,6 @@ class PostProcessor:
                         "/postprocessing/" + process + "/" + outpath,
                         result,
                         metadata={},
-=======
-                if isinstance(result, dict): # Multiple Signals as output
-                    for k, v in result:
-                        self.write_result(
-                            "/postprocessing/" + process + "/" + outpath +
-                            f'/{k}',
-                            v, metadata={}
-                        )
-                else:
-                    self.write_result(
-                        "/postprocessing/" + process + "/" + outpath, result, metadata={}
->>>>>>> 6578a57ac530cb518e07f0d5dcfc9523864973c2
                     )
 
     def write_result(