diff options
| author | Andras Timar <andras.timar@collabora.com> | 2022-02-03 12:24:24 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2022-02-03 12:24:24 +0100 |
| commit | 8fecc831337825ee6a5a471ec72f79bad5b3dda5 (patch) | |
| tree | 51c0ffedbdc63f1470f2f1a4b2b61eab2ad2ee93 /Dictionary_ckb.mk | |
| parent | d37591fce4d79d229ccb4543eee9815935b3f34f (diff) | |
resolve committed conflicts in this file
Change-Id: I98376d34feb682794bb92c4463a3854a8b8498ee
Diffstat (limited to 'Dictionary_ckb.mk')
0 files changed, 0 insertions, 0 deletions