Skip to content

Commit

Permalink
chore(package.json frontend/package.json): fix merge conflicts
Browse files Browse the repository at this point in the history 
chore #111
  • Loading branch information
@alejandrosaenz117
alejandrosaenz117 committed Jul 13, 2020
2 parents d3f3d97 + 8385a06 commit 244d123
Show file tree
Hide file tree
Showing 2 changed files with 471 additions and 466 deletions.
Loading

0 comments on commit 244d123

Please sign in to comment.