Merge branch 'dev' of github.com:johnnyon-amzn/dashboards-desktop int…

…o dev
opensearch-project · May 16, 2022 · f889312 · f889312
2 parents 7f6f2b1 + 2f9bf71
commit f889312
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/src/dashboards.js b/src/dashboards.js
@@ -9,13 +9,6 @@ const http = require('http');
 
 const superagent = require('superagent');
 
-<<<<<<< HEAD
-
-const CONFIG_PATH = path.join(__dirname, "config.json");
-
-
-=======
->>>>>>> d3dd86e (add crendentials manager with save and exit)
 async function getOSDStatus() {
     let statuses = {};
     try {