CT-975 Resolved conflicts for files other than src dashboard
Description
Resolved conflict for files other than src/dashboard & test cases.
Resolved conflict for below files:
-
CONFLICT (content): Merge conflict in src/jive/App.tsx
-
CONFLICT (content): Merge conflict in src/shared/components/CommandArgsFile/CommandArgsFile.tsx Test: error case in catch
-
CONFLICT (content): Merge conflict in src/shared/state/reducers/selectedDashboard/lib.ts
-
CONFLICT (content): Merge conflict in src/shared/ui/navbar/Navbar.tsx
-
CONFLICT (content): Merge conflict in Dockerfile
-
CONFLICT (content): Merge conflict in docs/src/conf.py
-
CONFLICT (content): Merge conflict in docs/src/history.rst
-
CONFLICT (content): Merge conflict in package.json
Motivation
Background on use case, changes needed
Fixes:
- Items added
Changes:
- changes made
Tests included/Docs Updated?
-
Included for each change/fix? -
Passing? (Merge will not be approved unless this is checked) -
Docs updated? -
New packages used/requires npm install? -
Toggle added for new features?
Edited by Ajaykumar Dubey