Fix merge conflicts

nephelaiio · May 16, 2024 · 869ac67 · 869ac67
1 parent 1461f19
commit 869ac67
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/galaxy.yml b/galaxy.yml
@@ -1,7 +1,7 @@
 ---
 namespace: nephelaiio
 name: mongodb
-version: 0.2.24
+version: 0.2.25
 readme: README.md
 authors:
   - Ted Cook <[email protected]>

diff --git a/molecule/update/molecule.yml b/molecule/update/molecule.yml
@@ -123,10 +123,6 @@ provisioner:
   name: ansible
   playbooks:
     prepare: ../common/prepare.yml
-<<<<<<< Updated upstream
-=======
-    destroy: ../common/destroy.yml
->>>>>>> Stashed changes
     converge: ../common/install.yml
     side_effect: ../common/restart.yml
     verify: ../common/verify.yml