From 9ed1d3d70bde19515a5f3dfda297c34cb9752810 Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Thu, 7 Apr 2022 18:20:14 +0000 Subject: [PATCH] chore(datetime): correctly resolve merge conflict --- core/src/components/datetime/datetime.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/core/src/components/datetime/datetime.tsx b/core/src/components/datetime/datetime.tsx index ebab2a6e15..ede717eb90 100644 --- a/core/src/components/datetime/datetime.tsx +++ b/core/src/components/datetime/datetime.tsx @@ -1,6 +1,5 @@ import type { ComponentInterface, EventEmitter } from '@stencil/core'; import { Component, Element, Event, Host, Method, Prop, State, Watch, h, writeTask } from '@stencil/core'; -import { printIonError } from '@utils/logging'; import { printIonError, printIonWarning } from '@utils/logging'; import { caretDownSharp, caretUpSharp, chevronBack, chevronDown, chevronForward } from 'ionicons/icons';