resolve conflict

aky15

2023-04-12 77eef7169caa601e285c484c4b7b25882764b181

1
2
3
4
5
6
7
isang    1
dalawang    2
tatlong    3
limang    5
anim na    6
pitong    7
walong    8