diff options
| author |   James Simon <jamsimox@amazon.com> | 2023-03-05 22:34:50 -0500 |
|---|---|---|
| committer | James Simon <jamsimox@amazon.com> | 2023-03-05 22:34:50 -0500 |
| commit | a2a266caea25dd82eb995449ff34099d8fd487b7 (patch) | |
| tree | d716c0e6af4cbf4459b19843866acb8ab8b8905e /settings.gradle | |
| parent | 58ff36093cb20fc7d3454a423975fe1479538372 (diff) | |
| parent | 4167b134485cabd6a9e19564baa130146183cfb8 (diff) | |
Resolve merge conflicts 1
Signed-off-by: James Simon <jamsimox@amazon.com>
Change-Id: I414d87b42e6a1182f7ad439a28284efde2c607e0
Diffstat (limited to 'settings.gradle')
0 files changed, 0 insertions, 0 deletions