Merge branch 'main' of https://github.com/mayabose/usdr-gost

usdigitalresponse · Jan 24, 2024 · 1c4515e · 1c4515e
2 parents 6908b5c + 0dc50da
commit 1c4515e
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/packages/client/src/main.js b/packages/client/src/main.js
@@ -23,19 +23,9 @@ if (window.APP_CONFIG?.GOOGLE_TAG_ID) {
   store.watch((state) => state.users.loggedInUser, (newUser) => setUserForGoogleAnalytics(newUser));
 }
 
-<<<<<<< Updated upstream
-<<<<<<< HEAD
-store.watch((state) => state.users.loggedInUser, (newUser) => datadogRum.setUser({ id: newUser.id, 'agency.id': newUser.agency_id, 'role': newUser.role.name, 'organization.id': newUser.tenant_id }));
-=======
 store.watch((state) => state.users.loggedInUser, (newUser) => datadogRum.setUser({
   id: newUser.id, 'agency.id': newUser.agency_id, role: newUser.role.name, 'organization.id': newUser.tenant_id,
 }));
->>>>>>> addUserInfo
-=======
-store.watch((state) => state.users.loggedInUser, (newUser) => datadogRum.setUser({
-  id: newUser.id, 'agency.id': newUser.agency_id, role: newUser.role.name, 'organization.id': newUser.tenant_id,
-}));
->>>>>>> Stashed changes
 
 // Install BootstrapVue
 Vue.use(BootstrapVue);