.

4 years ago · 0a241d4fc4
parent 9beb53ea4f
commit 0a241d4fc4
1 changed files with 0 additions and 3 deletions
--- a/composer.json
+++ b/composer.json
@ -128,13 +128,10 @@
        {
            "type": "path",
            "url": "./modules/wm-notification"
-<<<<<<< Updated upstream
        },
        {
            "type": "path",
            "url": "./modules/wm-roll-call"
-=======
->>>>>>> Stashed changes
        }
    ]
 }