From 8e00cc2aca107b3de5c8c5ee4ed222d9300eb663 Mon Sep 17 00:00:00 2001 From: Yakov Olkhovskiy Date: Wed, 30 Mar 2022 23:52:48 -0400 Subject: [PATCH] fix messed commit --- tests/queries/0_stateless/02205_ephemeral_1.sql | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/queries/0_stateless/02205_ephemeral_1.sql b/tests/queries/0_stateless/02205_ephemeral_1.sql index d7df2e61cfb..7a996ee3a8f 100644 --- a/tests/queries/0_stateless/02205_ephemeral_1.sql +++ b/tests/queries/0_stateless/02205_ephemeral_1.sql @@ -77,7 +77,4 @@ INSERT INTO t_ephemeral_02205_1 (x, y) VALUES (21, 7); SELECT * FROM t_ephemeral_02205_1; DROP TABLE IF EXISTS t_ephemeral_02205_1; -<<<<<<< HEAD -======= ->>>>>>> refactored to remove parsers rependency on datatypes