From 1bb56dfd8f1ecc0efe6bb101024bdfa0074d8bff Mon Sep 17 00:00:00 2001
From: markAtMicrosoft <v-schm@microsoft.com>
Date: Tue, 27 Aug 2019 10:26:00 -0700
Subject: [PATCH] Fix Merge Conflict

---
 package.json     | 5 +++++
 src/constants.ts | 8 ++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index ad992c1af..b7bfcd496 100644
--- a/package.json
+++ b/package.json
@@ -171,6 +171,11 @@
           "default": true,
           "scope": "resource"
         },
+        "pacifica.showNewFilePopup": {
+          "type": "boolean",
+          "default": true,
+          "scope": "resource"
+        },
         "deviceSimulatorExpress.debuggerServerPort": {
 
           "type": "number",
diff --git a/src/constants.ts b/src/constants.ts
index 796eb1407..692d13f55 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -17,8 +17,8 @@ const localize: nls.LocalizeFunc = nls.config({
 })();
 
 export const CONFIG = {
-  SHOW_DEPENDENCY_INSTALL: "deviceSimulatorExpress.showDependencyInstall"
-
+  SHOW_DEPENDENCY_INSTALL: "deviceSimulatorExpress.showDependencyInstall",
+  SHOW_NEW_FILE_POPUP: "pacifica.showNewFilePopup"
 };
 
 export const CONSTANTS = {
@@ -215,6 +215,10 @@ export const CONSTANTS = {
     SERIAL_MONITOR_NAME: localize(
       "misc.serialMonitorName",
       "Device Simulator Express Serial Monitor"
+    ),
+    SERIAL_MONITOR_TEST_IF_OPEN: localize(
+      "misc.testIfPortOpen",
+      "Test if serial port is open"
     )
   },
   NAME: localize("name", "Device Simulator Express"),