commit 0e06e2eb3ef316de979095fdb1c992b051ee7e81
author Eliza Margaretha <margaretha@ids-mannheim.de> Fri Nov 04 15:47:34 2016 +0100
committer Eliza Margaretha <margaretha@ids-mannheim.de> Fri Nov 04 15:47:34 2016 +0100
tree e3a47431e287de314b032bbeed9e5ca664ccf4e0
parent d7fda43105f5538bba025c9410ce599758f22584
parent 9ca9ba3b70b8a7b41273c96b3ba378e336a942e9

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

Conflicts:
	.gitignore
	pom.xml

.gitignore

diff --git a/.gitignore b/.gitignore
index 35f3010..15e8222 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,8 @@
 .classpath
 .project
 .settings
-/target
\ No newline at end of file
+<<<<<<< HEAD
+/target
+=======
+/target
+>>>>>>> branch 'dev' of ssh://margaretha@korap.ids-mannheim.de:29418/KorAP/KorapSRU

pom.xml

diff --git a/pom.xml b/pom.xml
index a075c99..83c7e1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
     	<groupId>org.apache.directory.studio</groupId>
     	<artifactId>org.apache.commons.lang</artifactId>
     	<version>2.6</version>
-    </dependency>
+    </dependency>   
   </dependencies> 
  
   <repositories>
@@ -74,7 +74,6 @@
       <id>CLARIN</id>
       <name>CLARIN Repository</name>
       <url>https://nexus.clarin.eu/content/repositories/Clarin</url>
-      <!-- <url>http://catalog.clarin.eu/ds/nexus/content/repositories/Clarin/</url> -->
       <layout>default</layout>
     </repository>   
   </repositories>