resolve conflict

This commit is contained in:
Christian Schabesberger 2017-11-16 12:20:03 +01:00
commit 14ed220f34
16 changed files with 134 additions and 41 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 108 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 112 B