Fix merge conflicts

fe9e1a38 · Timm Fitschen · 6eabb13f · fe9e1a38
Verified Commit fe9e1a38 authored 2 years ago by Timm Fitschen
--- 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?
 ;