Fix rebase

Signed-off-by: Daniel Henneberger <git@danielhenneberger.com>
DataSQRL · Aug 25, 2024 · a0dd6fe · a0dd6fe
1 parent 79a5b66
commit a0dd6fe
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/sqrl-tools/sqrl-run/src/main/java/com/datasqrl/DatasqrlRun.java b/sqrl-tools/sqrl-run/src/main/java/com/datasqrl/DatasqrlRun.java
@@ -116,10 +116,7 @@ public CompiledPlan compileFlink() {
       if (statement.trim().isEmpty()) {
         continue;
       }
-<<<<<<< Updated upstream
-=======
 //      System.out.println(replaceWithEnv(statement));
->>>>>>> Stashed changes
       tableResult = tEnv.executeSql(replaceWithEnv(statement));
     }
     String insert = replaceWithEnv(statements.get(statements.size() - 1));