commit bf55ed9d4264da36c531686e6b3e8542b01ab0e9
author Eliza Margaretha <margaretha@ids-mannheim.de> Thu Jun 09 17:36:18 2016 +0200
committer Eliza Margaretha <margaretha@ids-mannheim.de> Thu Jun 09 17:36:25 2016 +0200
tree b835812820afa279553c39fbad2d93453e8e44f4
parent e00f875ba3b22ba50bb62aa2205aeeb23c67728e
parent b57f29129ad10b336f70cf52e275ae7c88178259

Merge branch 'fcs-ql' of
ssh://margaretha@korap.ids-mannheim.de:29418/KorAP/Koral into fcs-ql

Conflicts:
	src/main/java/de/ids_mannheim/korap/query/serialize/QuerySerializer.java

Change-Id: Id1037d133c9fa6ea7cb4e07f0ae32ed978671c18

pom.xml

diff --git a/pom.xml b/pom.xml
index f575129..00f257e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,6 +29,11 @@
     </dependency>
     <dependency>
       <groupId>org.antlr</groupId>
+      <artifactId>antlr4-runtime</artifactId>
+      <version>4.5.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.antlr</groupId>
       <artifactId>antlr4-maven-plugin</artifactId>
       <version>4.2</version>
     </dependency>