Fix bad merge

Automattic · Sep 22, 2020 · 55f2f85 · 55f2f85
1 parent bea008f
commit 55f2f85
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/client/state/themes/selectors/get-jetpack-upgrade-url-if-premium-theme.js b/client/state/themes/selectors/get-jetpack-upgrade-url-if-premium-theme.js
@@ -1,11 +1,7 @@
 /**
  * Internal dependencies
  */
-<<<<<<< HEAD
-import { shouldShowOfferResetFlow } from 'lib/plans/config';
-=======
-import { shouldShowOfferResetFlow } from 'calypso/lib/abtest/getters';
->>>>>>> Auto-fix rule wpcalypso/no-package-relative-imports
+import { shouldShowOfferResetFlow } from 'calypso/lib/plans/config';
 import {
 	FEATURE_UNLIMITED_PREMIUM_THEMES,
 	PLAN_JETPACK_SECURITY_REALTIME,