| commit | 0e06e2eb3ef316de979095fdb1c992b051ee7e81 | [log] [tgz] |
|---|---|---|
| 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 [diff] [blame] | |
| parent | 9ca9ba3b70b8a7b41273c96b3ba378e336a942e9 [diff] [blame] |
Merge branch 'dev' of ssh://margaretha@korap.ids-mannheim.de:29418/KorAP/KorapSRU into dev Conflicts: .gitignore pom.xml
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