Skip to content

Commit

Permalink
Fix the merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
gvidon committed Nov 17, 2022
2 parents 7525c2f + 800421c commit 2d47c40
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ottofeller/dangerules",
"version": "1.1.3",
"version": "1.1.4",
"description": "A set of Danger.js rules common applied in OttoFeller projects.",
"main": "dist/index.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export * as bumpPackageVersion from './bump-package-version'
export * as nagSuppression from './cdk'
export * as cdk from './cdk'
export * as commonCodeDir from './common-code-dir'
export * as hasura from './hasura'
export * as nextjs from './nextjs'
Expand Down

0 comments on commit 2d47c40

Please sign in to comment.