Skip to content

Commit

Permalink
chore: resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
CodyJasonBennett committed Sep 17, 2023
1 parent 399ec09 commit b8a3ee5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion packages/fiber/src/core/reconciler.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ interface HostConfig {
noTimeout: -1
}

const catalogue: Catalogue = {}
export const catalogue: Catalogue = {}

let i = 0

Expand Down
2 changes: 2 additions & 0 deletions packages/fiber/tests/__snapshots__/index.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,14 @@ Array [
"Loader",
"LoaderProto",
"LoaderResult",
"MathRepresentation",
"MathType",
"Mutable",
"ObjectMap",
"Overwrite",
"Performance",
"Properties",
"Props",
"Quaternion",
"RaycastableRepresentation",
"ReactProps",
Expand Down

0 comments on commit b8a3ee5

Please sign in to comment.