Skip to content

Commit

Permalink
test: resolve merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
anandsunderraman committed Feb 2, 2022
1 parent b9fbec7 commit d80df90
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 57 deletions.
114 changes: 60 additions & 54 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
"@asyncapi/generator-hooks": "^0.1.0",
"@asyncapi/generator-react-sdk": "^0.2.23",
"@asyncapi/modelina": "^0.46.0"
"rimraf": "^3.0.2"
},
"release": {
"branches": [
Expand Down
3 changes: 1 addition & 2 deletions template/go.sum.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { File } from '@asyncapi/generator-react-sdk';

export default function({ asyncapi }) {

return (
<File name="go.sum">
{`
Expand Down Expand Up @@ -81,4 +80,4 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
`}
</File>
);
}
}

0 comments on commit d80df90

Please sign in to comment.