missed merge edit

Author: natolambert

src/diffusers/schedulers/scheduling_ddim.py

@@ -234,11 +234,8 @@ def step(
         if not return_dict:
             return (prev_sample,)
 
-<<<<<<< HEAD
         return SchedulerOutput(prev_sample=prev_sample)
 
-=======
->>>>>>> 5095a1d ([Type hint] scheduling ddim (#343))
     def add_noise(
         self,
         original_samples: Union[torch.FloatTensor, np.ndarray],