Skip to content

Commit

Permalink
fix merge conflict
Browse files Browse the repository at this point in the history
Signed-off-by: Jonathan Casey <[email protected]>
  • Loading branch information
jonathan-casey committed Nov 3, 2023
2 parents 5cf9d21 + 26a0b79 commit a01fe38
Show file tree
Hide file tree
Showing 2 changed files with 252 additions and 253 deletions.
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
"author": "accordproject.org",
"license": "Apache-2.0",
"devDependencies": {
"@accordproject/concerto-cto": "3.14.2",
"@accordproject/concerto-cto": "3.14.2",
"@babel/preset-env": "7.16.11",
"babel-loader": "8.2.3",
Expand Down
Loading

0 comments on commit a01fe38

Please sign in to comment.