Skip to content

Commit

Permalink
resolve conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Maria committed Sep 19, 2024
2 parents 7cb8c62 + 3bb8d8e commit 9c9da31
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 10 deletions.
8 changes: 0 additions & 8 deletions Contentful-Schema/migrations/0009-maria-test.cjs

This file was deleted.

3 changes: 1 addition & 2 deletions Contentful-Schema/migrations/manifest.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@
0005-create-employer-standards-page-category.cjs
0006-accordion-component.cjs
0007-add-header-field-to-navigation-menu.cjs
0008-details-component.cjs
0009-maria-test.cjs
0008-details-component.cjs
Binary file modified Contentful-Schema/migrations/migrations.tar.gz
Binary file not shown.

0 comments on commit 9c9da31

Please sign in to comment.