fixed merge conflict (37d55685) · Commits · ccce / dev / ce-deploy-ui · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

ce-deploy-ui
- Activity
- Members
- Labels
- Jira
- Environments
- Terraform modules

Snippets Groups Projects

37d55685

Commit 37d55685 authored 1 year ago by Johanna Szepanski

Downloads
- Plain Diff

fixed merge conflict

parents 07074b3d 273867ca

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

package-lock.json 67 additions, 7 deletions

package-lock.json
package.json 1 addition, 1 deletion

package.json
src/components/IOC/IOCIcons/IOCIcons.js 23 additions, 13 deletions

src/components/IOC/IOCIcons/IOCIcons.js
src/components/IOC/IOCTable/IOCTable.spec.js 2 additions, 2 deletions

src/components/IOC/IOCTable/IOCTable.spec.js
src/components/Job/JobStatus.js 5 additions, 5 deletions

src/components/Job/JobStatus.js
src/components/deployments/DeploymentIcons.js 4 additions, 4 deletions

src/components/deployments/DeploymentIcons.js
src/components/records/RecordSearch.js 2 additions, 12 deletions

src/components/records/RecordSearch.js
src/mocks/fixtures/IOCStatus.json 19 additions, 2 deletions

src/mocks/fixtures/IOCStatus.json
src/views/records/RecordListView.js 2 additions, 12 deletions

src/views/records/RecordListView.js

with 125 additions and 58 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment