Commit 08ee861b authored by sudheer's avatar sudheer
Browse files

Fix bad merge

parent 4322c178
...@@ -37,11 +37,7 @@ ...@@ -37,11 +37,7 @@
"localforage-observable": "2.0.1", "localforage-observable": "2.0.1",
"mark.js": "8.11.1", "mark.js": "8.11.1",
"marked": "github:mattermost/marked#87769262aa02e1784570f61f4f962050e07cc335", "marked": "github:mattermost/marked#87769262aa02e1784570f61f4f962050e07cc335",
<<<<<<< HEAD "mattermost-redux": "github:mattermost/mattermost-redux#7d60020600ffa69ee9ff901e5ac88bcf447977ec",
"mattermost-redux": "github:mattermost/mattermost-redux#422f46b16b3f4b0a9e6acada344c2404aa634e53",
=======
"mattermost-redux": "github:mattermost/mattermost-redux#7522d68c6a61a5bf535672670ef6195e610f2fa0",
>>>>>>> fc3b16501... MM-26971 Fix GM duplicates when created and already exists in a category (#5999)
"moment-timezone": "0.5.31", "moment-timezone": "0.5.31",
"p-queue": "^6.4.0", "p-queue": "^6.4.0",
"pdfjs-dist": "2.0.489", "pdfjs-dist": "2.0.489",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment