diff options
| author | Andras Timar <andras.timar@collabora.com> | 2017-05-22 18:13:26 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-05-22 18:13:26 +0200 |
| commit | 6c4de48d4fea09c0c61fe6f8fa853313dfeeb3d3 (patch) | |
| tree | 0c8f7e4355df34dd5a0a4b2d2c84c1e7cae074be /bridges | |
| parent | ae4763d5bdce00abebf39219cf7209da79c3aa54 (diff) | |
fix git merge errorcp-5.3-14
Change-Id: Ic1d72b3c4afb6c328723797bb8fa6219d4d295bb
Diffstat (limited to 'bridges')
0 files changed, 0 insertions, 0 deletions