| commit | 350f8f640ca93a0c434d40e13657658108b0ee4b | [log] [tgz] |
|---|---|---|
| author | Michael Hanl <micha.hanl@gmail.com> | Fri Jun 03 11:25:22 2016 +0200 |
| committer | Michael Hanl <micha.hanl@gmail.com> | Fri Jun 03 11:25:22 2016 +0200 |
| tree | ee7318dd0feccef71f9d92804e3d88694ee5380e | |
| parent | bb7c3df8e8656646aa405969ca86bf634740cfab [diff] | |
| parent | 9a2421617d7140937738427ec6c35989339a1dfd [diff] |
merge conflict resolution