| margaretha | 8e0709f | 2016-07-19 16:22:41 +0200 | [diff] [blame] | 1 | .classpath |
| Eliza Margaretha | e297b68 | 2016-10-06 16:06:22 +0200 | [diff] [blame] | 2 | .project |
| 3 | .settings | ||||
| Eliza Margaretha | 0e06e2e | 2016-11-04 15:47:34 +0100 | [diff] [blame^] | 4 | <<<<<<< HEAD |
| margaretha | 4180550 | 2016-07-19 16:22:41 +0200 | [diff] [blame] | 5 | /target |
| Eliza Margaretha | 0e06e2e | 2016-11-04 15:47:34 +0100 | [diff] [blame^] | 6 | ======= |
| 7 | /target | ||||
| 8 | >>>>>>> branch 'dev' of ssh://margaretha@korap.ids-mannheim.de:29418/KorAP/KorapSRU | ||||