diff options
| author | Peter Stone <thepeterstone@gmail.com> | 2026-05-03 15:46:51 -1000 |
|---|---|---|
| committer | Peter Stone <thepeterstone@gmail.com> | 2026-05-03 15:46:51 -1000 |
| commit | f9cf42e5087a747aae480544173127d6b0f8a956 (patch) | |
| tree | 21bdfca02491e6ff4cde7a22673c821c0a03e108 /android-app/app/src/main/res | |
| parent | e1db9200e9d44c10450361cc8984a45b2eda87b7 (diff) | |
| parent | 21b365b805004d521b025a1478aec07878f358a8 (diff) | |
resolve merge conflict in .claude/settings.local.json
Keep HEAD version which has the full set of Android emulator and tooling permissions.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Diffstat (limited to 'android-app/app/src/main/res')
0 files changed, 0 insertions, 0 deletions