tree 8b192f327f40229e4ae7c3b66c6d71198943bd26
parent aaf43b2269bd9abd4adf5d5d554b49f74a28f3e0
author margaretha <margaretha@ids-mannheim.de> 1731055625 +0100
committer margaretha <margaretha@ids-mannheim.de> 1731055625 +0100

Fixed class file version conflicts.

Change-Id: I11c60c75c7824a85ee690c7510f2834df61ed2df