Updated file

slcorp · Apr 26, 2019 · a1cb841 · a1cb841
1 parent f2c13d7
commit a1cb841
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/RTView-Cumulocity-Node/USERINFO.json b/RTView-Cumulocity-Node/USERINFO.json
@@ -1,11 +1,5 @@
 {
-<<<<<<< HEAD
-    "username": "MehranS",
-    "password": "cummeh17",
-    "baseURL": "https://edgeanalytics.cumulocity.com"
-=======
     "username": "slcorptest/[email protected]",
     "password": "slc0rpt3st",
     "baseURL": "https://slcorptest.cumulocity.com"
->>>>>>> 0ef5ce21b656cabfecaeb6e9391af062d4205b62
 }