Sebastian Stenzel 99fce8d0b7 automatically resolve conflicts for directory files, that contain the same directory ID

2016-05-23 11:02:44 +02:00

..

src

automatically resolve conflicts for directory files, that contain the same directory ID

2016-05-23 11:02:44 +02:00

.gitignore

renamed filesystem layer maven modules

2015-12-18 00:06:31 +01:00

pom.xml

adjusted snapshot version [ci skip]

2016-03-21 16:49:58 +01:00