Skip to content
This repository has been archived by the owner on Sep 18, 2024. It is now read-only.

Commit

Permalink
fix issues in merging master
Browse files Browse the repository at this point in the history
  • Loading branch information
QuanluZhang committed Oct 23, 2020
1 parent 8c7b03c commit d511c7a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ export const EditExperimentParam = (): any => {
return val;
}
}

return (
<AppContext.Consumer>
{(values): React.ReactNode => {
Expand Down
1 change: 1 addition & 0 deletions src/webui/src/components/overview/table/SuccessTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ class SuccessTable extends React.Component<SuccessTableProps, SuccessTableState>
job with <span>{DETAILTABS}</span> button.
</React.Fragment>
);

columns = [
{
name: 'Trial No.',
Expand Down
8 changes: 4 additions & 4 deletions src/webui/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8913,10 +8913,10 @@ node-fetch-npm@^2.0.2:
json-parse-better-errors "^1.0.0"
safe-buffer "^5.1.1"

node-forge@0.9.0:
version "0.9.0"
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.9.0.tgz#d624050edbb44874adca12bb9a52ec63cb782579"
integrity sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==
node-forge@^0.10.0:
version "0.10.0"
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==

node-gyp@^3.8.0:
version "3.8.0"
Expand Down

0 comments on commit d511c7a

Please sign in to comment.