From 0a241d4fc40b1352da0d93f09ae2b9b16c161d1c Mon Sep 17 00:00:00 2001
From: aliqasemi <qasemi4245qq@gmail.com>
Date: Tue, 2 Mar 2021 16:02:46 +0330
Subject: [PATCH] .

---
 composer.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/composer.json b/composer.json
index a9c723e..65256dc 100644
--- 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
         }
     ]
 }