From fe9e1a3891cadd8b3622943adb6cb260c9c4c379 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Mon, 13 Mar 2023 11:50:42 +0100
Subject: [PATCH] Fix merge conflicts
---
src/main/java/org/caosdb/server/query/CQLLexer.g4 | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/main/java/org/caosdb/server/query/CQLLexer.g4 b/src/main/java/org/caosdb/server/query/CQLLexer.g4
index 95189d53..518d1628 100644
--- a/src/main/java/org/caosdb/server/query/CQLLexer.g4
+++ b/src/main/java/org/caosdb/server/query/CQLLexer.g4
@@ -328,11 +328,6 @@ NEGATION:
) WHITE_SPACE_f?
;
-/** */
-WITH:
- [Ww][Ii][Tt][Hh] WHITE_SPACE_f?
-;
-
/** */
WITH_A:
[Ww][Ii][Tt][Hh] (WHITE_SPACE_f? A)? WHITE_SPACE_f?
@@ -373,6 +368,7 @@ ELSE:
[Ee][Ll][Ss][Ee] WHITE_SPACE_f?
;
+/** */
WHERE:
[Ww][Hh][Ee][Rr][Ee] WHITE_SPACE_f?
;
--
GitLab