commit 2a5718e7acd2132f5b5875395659c0c03df948f2
author Michael Hanl <hanl@ids-mannheim.de> Tue Nov 17 22:20:03 2015 +0100
committer Michael Hanl <hanl@ids-mannheim.de> Tue Nov 17 22:20:03 2015 +0100
tree a0bdac66bca8c73eba631038d94a5555ad31d760
parent bcb48c783ac9c8a6c43dd735568b2c8bbf4a2f20
parent ad362b25a353bcceefcab3a64a1a1376a19cd61d

DS_Store merge

src/main/java/de/ids_mannheim/korap/web/.DS_Store

diff --git a/src/main/java/de/ids_mannheim/korap/web/.DS_Store b/src/main/java/de/ids_mannheim/korap/web/.DS_Store
deleted file mode 100644
index 1383f97..0000000
--- a/src/main/java/de/ids_mannheim/korap/web/.DS_Store
+++ /dev/null
Binary files differ

src/main/resources/.DS_Store

diff --git a/src/main/resources/.DS_Store b/src/main/resources/.DS_Store
deleted file mode 100644
index 0f6288e..0000000
--- a/src/main/resources/.DS_Store
+++ /dev/null
Binary files differ

src/test/.DS_Store

diff --git a/src/test/.DS_Store b/src/test/.DS_Store
deleted file mode 100644
index 5e34de7..0000000
--- a/src/test/.DS_Store
+++ /dev/null
Binary files differ

src/test/java/.DS_Store

diff --git a/src/test/java/.DS_Store b/src/test/java/.DS_Store
deleted file mode 100644
index ebd2d37..0000000
--- a/src/test/java/.DS_Store
+++ /dev/null
Binary files differ