From c1d58bb25fd4c9ac4687a5309e5da65ae5962e34 Mon Sep 17 00:00:00 2001
From: Joel McKinnon <joel.g.mckinnon@nasa.gov>
Date: Mon, 16 Dec 2019 16:55:26 -0800
Subject: [PATCH] fixed another minor merge conflict

---
 src/plugins/plugins.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/plugins.js b/src/plugins/plugins.js
index f6e7203d9d..a805684fea 100644
--- a/src/plugins/plugins.js
+++ b/src/plugins/plugins.js
@@ -47,7 +47,7 @@ define([
     './goToOriginalAction/plugin',
     './clearData/plugin',
     './webPage/plugin',
-    './condition/plugin'
+    './condition/plugin',
     './themes/espresso',
     './themes/maelstrom',
     './themes/snow'
@@ -78,7 +78,7 @@ define([
     GoToOriginalAction,
     ClearData,
     WebPagePlugin,
-    ConditionPlugin
+    ConditionPlugin,
     Espresso,
     Maelstrom,
     Snow