From 9202251c3ca0efdee8feeb5303064d10b01ae1e8 Mon Sep 17 00:00:00 2001
From: ermisw <ermis.wieger@gmail.com>
Date: Thu, 30 Sep 2021 11:00:53 +0200
Subject: [PATCH] resolved conflicts in component.json

---
 .gitignore                                               | 3 ++-
 .../00_Global-Config/auto-tag/Component.json             | 9 ---------
 environment.yaml                                         | 4 ++--
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1b941e75..d9de1819 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .env
 .vscode/*
 setenv.bat
-.logs
\ No newline at end of file
+.logs
+./environment.yaml
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/00_Global-Config/auto-tag/Component.json b/BMW-Dynatrace-config/00_Global-Config/auto-tag/Component.json
index 52a8f1c4..7f0f75a7 100644
--- a/BMW-Dynatrace-config/00_Global-Config/auto-tag/Component.json
+++ b/BMW-Dynatrace-config/00_Global-Config/auto-tag/Component.json
@@ -4151,11 +4151,7 @@
    {
     "type": "SERVICE",
     "enabled": true,
-<<<<<<< HEAD
     "valueFormat": "rsu",
-=======
-    "valueFormat": "ASBC-HAL-CL",
->>>>>>> 66042505f351ff2f91db06a9972f047047e2105c
     "propagationTypes": [],
     "conditions": [
      {
@@ -4175,13 +4171,8 @@
       },
       "comparisonInfo": {
        "type": "STRING",
-<<<<<<< HEAD
        "operator": "CONTAINS_REGEX",
        "value": "^(?>cam|disp|fre|rcs|rdh|rmo|rpp|rte|rve|rvi|rvt|rwd|uvm)(?>eu|us|cn)(?>e2e|p)$",
-=======
-       "operator": "CONTAINS",
-       "value": "asbchal",
->>>>>>> 66042505f351ff2f91db06a9972f047047e2105c
        "negate": false,
        "caseSensitive": true
       }
diff --git a/environment.yaml b/environment.yaml
index 7478966e..6af64c8a 100644
--- a/environment.yaml
+++ b/environment.yaml
@@ -20,10 +20,10 @@ NA-PreProd:
 
 CN-Prod:
     - name: "CN-Prod"
-    - env-url: "https://dynatracemgd-cn.bmwgroup.net/e/b921f1b9-c00e-4031-b9d1-f5a0d530757b"
+    - env-url: "https://dynatracemgd-cn.bmwgroup.net/e/b921f1b9-c00e-4031-b9d1-f5a0d530757b@PROXY"
     - env-token-name: "CN_Prod_TOKEN"
 
 CN-PreProd:
     - name: "CN-PreProd"
-    - env-url: "https://dynatracemgd-cn.bmwgroup.net/e/ab88c03b-b7fc-45f0-9115-9e9ecc0ced35"
+    - env-url: "https://dynatracemgd-cn.bmwgroup.net/e/ab88c03b-b7fc-45f0-9115-9e9ecc0ced35@PROXY"
     - env-token-name: "CN_PreProd_TOKEN"
\ No newline at end of file