commit b440a162fc3bc394a09da719e058ae5d67b60bae
author margaretha <margaretha@ids-mannheim.de> Fri Nov 20 14:33:23 2020 +0100
committer margaretha <margaretha@ids-mannheim.de> Fri Nov 20 14:33:23 2020 +0100
tree ad1d937d33082fd588f73280cb2b133f0c09bac2
parent 34e45a7f624220db26dc0c463d81b4d84ee5f4ba
parent 98a6d93b1a0c1a13527a5994b9f6a32a5bfc7ceb

Merge branch 'dev' of ssh://margaretha@korap.ids-mannheim.de:29418/KorAP/KorapSRU into dev

.gitignore

diff --git a/.gitignore b/.gitignore
index 9f0382d..ed3d86d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,4 @@
 .project
 .settings
 target
-
+out.json

pom.xml

diff --git a/pom.xml b/pom.xml
index 2dabb5e..1a655ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.12</version>
+			<version>4.13.1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>