7e290d3e52
for more information, see https://pre-commit.ci
2.9 KiB
2.9 KiB
1 | <<<<<<< HEAD |
---|---|
2 | ======= |
3 | >>>>>>> master |