solved conflict issue

bcgov · Nov 17, 2023 · 9d4a562 · 9d4a562
2 parents 4dff481 + 224c106
commit 9d4a562
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 5 deletions.
diff --git a/openshift/templates/custom-resource-definitions/sysdig-team.yaml b/openshift/templates/custom-resource-definitions/sysdig-team.yaml
@@ -9,7 +9,27 @@ spec:
     users:
     - name: brandon.bouchard@gov.bc.ca
       role: ROLE_TEAM_EDIT
+    - name: adam.kroon@gov.bc.ca
+      role: ROLE_TEAM_EDIT
+    - name: chris.mcglone@gov.bc.ca
+      role: ROLE_TEAM_EDIT
+    - name: paul.baker@gov.bc.ca
+      role: ROLE_TEAM_EDIT
+    - name: sylar.1.zhang@gov.bc.ca
+      role: ROLE_TEAM_EDIT
     - name: braden.mitchell@gov.bc.ca
       role: ROLE_TEAM_STANDARD
+    - name: noor.chasib@gov.bc.ca
+      role: ROLE_TEAM_STANDARD
+    - name: sarah.son@gov.bc.ca
+      role: ROLE_TEAM_STANDARD
+    - name: andrew.hopewell@gov.bc.ca
+      role: ROLE_TEAM_STANDARD
+    - name: vanessa.steffens@gov.bc.ca
+      role: ROLE_TEAM_STANDARD
+    - name: matthew.morris@gov.bc.ca
+      role: ROLE_TEAM_STANDARD
+    - name: alexander.punnett@gov.bc.ca
+      role: ROLE_TEAM_STANDARD
     - name: peggy.king@gov.bc.ca
       role: ROLE_TEAM_READ
diff --git a/src/frontend/package-lock.json b/src/frontend/package-lock.json
diff --git a/src/frontend/package.json b/src/frontend/package.json
@@ -19,8 +19,8 @@
     "wdio-test": "wdio run ./wdio.conf.js --baseUrl=\"https://test.pia.gov.bc.ca\" --suite e2e"
   },
   "dependencies": {
+    "@bcgov/citz-imb-richtexteditor": "https://github.com/bcgov/citz-imb-richtexteditor/releases/download/v1.5.1/bcgov-citz-imb-richtexteditor-1.5.1.tgz",
     "@bcgov/bc-sans": "2.1.0",
-    "@bcgov/citz-imb-richtexteditor": "https://github.com/bcgov/citz-imb-richtexteditor/releases/download/v1.4.1/bcgov-citz-imb-richtexteditor-1.4.1.tgz",
     "@fortawesome/fontawesome-svg-core": "6.4.2",
     "@fortawesome/free-solid-svg-icons": "6.4.2",
     "@fortawesome/react-fontawesome": "0.2.0",