| commit | 49b9b24a35b2f0b53b6fbd84c5fc54de6151fd8c | [log] [tgz] |
|---|---|---|
| author | Danny Baumann <dannybaumann@web.de> | Wed Mar 25 12:47:27 2015 +0100 |
| committer | Danny Baumann <dannybaumann@web.de> | Wed Mar 25 12:49:26 2015 +0100 |
| tree | 352d55a4cb27816a6f74c6c0d4db369cd437995e | |
| parent | c569a957df64f0432a7d5e8fd5f60ac19e34542a [diff] |
Fix merge relicts. Change-Id: I5a352640ba5704acd69382e53a15626cfd214487