From f225aa25de643ef83aaf2b5ab240d2dc97ec0c4d Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 27 Nov 2017 13:26:59 -0500 Subject: [PATCH] bloody hell... --- install/package.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/install/package.json b/install/package.json index 7514333162..3465b30c08 100644 --- a/install/package.json +++ b/install/package.json @@ -69,11 +69,7 @@ "nodebb-plugin-spam-be-gone": "0.5.1", "nodebb-rewards-essentials": "0.0.9", "nodebb-theme-lavender": "5.0.0", -<<<<<<< Updated upstream - "nodebb-theme-persona": "7.1.5", -======= "nodebb-theme-persona": "7.1.6", ->>>>>>> Stashed changes "nodebb-theme-slick": "1.1.2", "nodebb-theme-vanilla": "8.1.1", "nodebb-widget-essentials": "4.0.1",