fix: conflict

This commit is contained in:
renovate[bot]
2019-03-11 11:08:17 -04:00
committed by Barış Soner Uşaklı
parent 81d7fd04ad
commit 9c4b2d9cd2

View File

@@ -80,7 +80,7 @@
"mousetrap": "^1.6.1",
"mubsub-nbb": "^1.5.0",
"nconf": "^0.10.0",
"nodebb-plugin-composer-default": "6.2.7",
"nodebb-plugin-composer-default": "6.2.9",
"nodebb-plugin-dbsearch": "3.0.6",
"nodebb-plugin-emoji": "^2.2.5",
"nodebb-plugin-emoji-android": "2.0.0",