Skip to content

Commit

Permalink
merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
davidmccabe committed Mar 21, 2022
1 parent e757f68 commit 78cacf1
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions packages/shared/ReactFeatureFlags.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,7 @@ export const enableLegacyFBSupport = false;
// -----------------------------------------------------------------------------

export const enableCache = __EXPERIMENTAL__;
<<<<<<< HEAD
export const enableCacheElement = true;
=======
export const enableCacheElement = __EXPERIMENTAL__;
>>>>>>> 1b948ff7ab25948ec9b9d6d0a4dd7f4046a75e9b

export const enableTransitionTracing = false;

Expand Down

0 comments on commit 78cacf1

Please sign in to comment.