presence: complete previous commit

(cherry picked from commit 53c803b)
OpenSIPS · Mar 21, 2024 · c45cabb · c45cabb
1 parent 9505498
commit c45cabb
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/presence/01.presence/scenario.yml b/presence/01.presence/scenario.yml
@@ -31,8 +31,4 @@ tasks:
     require:
       after:
         task: Publish
-<<<<<<< Updated upstream
-        wait: 2
-=======
         wait: 1
->>>>>>> Stashed changes